generic-x86: migrate to the new composition model

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>

Author: brianmcgillion

targets/generic-x86_64/flake-module.nix

@@ -2,6 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Generic x86_64 computer -target
+#
+# This is a minimal target that runs GUI on the HOST with netvm for networking.
+# It uses an inline netvmBase instead of the full laptop-x86 profile.
 {
   inputs,
   lib,
@@ -55,6 +58,37 @@ let
               modulesPath,
               ...
             }:
+            let
+              # Create globalConfig for the netvm
+              globalConfig = lib.ghaf.mkGlobalConfig config;
+
+              # Create inline netvmBase (following laptop-x86 pattern)
+              netvmBase = lib.nixosSystem {
+                inherit (inputs.nixpkgs.legacyPackages.x86_64-linux) system;
+                modules = [
+                  inputs.microvm.nixosModules.microvm
+                  inputs.self.nixosModules.netvm-base
+                  # Import nixpkgs config for overlays
+                  {
+                    nixpkgs.overlays = config.nixpkgs.overlays;
+                    nixpkgs.config = config.nixpkgs.config;
+                  }
+                ];
+                specialArgs = lib.ghaf.vm.mkSpecialArgs {
+                  inherit lib inputs globalConfig;
+                  hostConfig =
+                    lib.ghaf.vm.mkHostConfig {
+                      inherit config;
+                      vmName = "net-vm";
+                    }
+                    // {
+                      netvm = {
+                        wifi = config.ghaf.virtualization.microvm.netvm.wifi or false;
+                      };
+                    };
+                };
+              };
+            in
             {
               # https://github.com/nix-community/nixos-generators/blob/master/formats/raw-efi.nix#L24-L29
               system.build.raw = lib.mkOverride 98 (
@@ -66,23 +100,28 @@ let
                   postVM = "${pkgs.zstd}/bin/zstd --compress --rm $out/nixos.img";
                 }
               );
+
+              # Wire up netvm using inline netvmBase
+              ghaf.virtualization.microvm.netvm.evaluatedConfig = netvmBase.extendModules {
+                modules = config.ghaf.hardware.definition.netvm.extraModules or [ ];
+              };
             }
           )
 
           {
             ghaf = {
               hardware.x86_64.common.enable = true;
 
+              # Hardware passthrough for netvm (WiFi device)
+              hardware.definition.netvm.extraModules = netvmExtraModules;
+
               virtualization = {
                 microvm-host = {
                   enable = true;
                   networkSupport = true;
                 };
 
-                microvm.netvm = {
-                  enable = true;
-                  extraModules = netvmExtraModules;
-                };
+                microvm.netvm.enable = true;
               };
 
               host.networking.enable = true;