refactor(hardware): remove hw deps

mbssrc · mbssrc · commit 1340965b195b · 2025-04-07T14:33:38.000+04:00
- remove hardware definition dependencies
- move shm and mem manager
- initial reference flake module file

Signed-off-by: Manuel Bluhm &lt;manuel@ssrc.tii.ae&gt;
diff --git a/modules/common/flake-module.nix b/modules/common/flake-module.nix
@@ -16,9 +16,6 @@
       ./systemd
       ./services
       ./networking
-      #TODO: this should be moved to where it is needed and included on demand
-      # if it is a common then the file should be moved to common
-      ../hardware/definition.nix
       ./logging
     ];
   };
diff --git a/modules/flake-module.nix b/modules/flake-module.nix
@@ -3,7 +3,6 @@
 #
 # Modules to be exported from Flake
 #
-{ ... }:
 {
   imports = [
     ./partitioning/flake-module.nix
@@ -15,15 +14,6 @@
     ./common/flake-module.nix
     ./development/flake-module.nix
     ./desktop/flake-module.nix
+    ./reference/flake-module.nix
   ];
-
-  flake.nixosModules = {
-    #TODO: Add the rest of the modules in their own directories with flake-module.nix
-    reference-appvms.imports = [ ./reference/appvms ];
-    reference-host-demo-apps.imports = [ ./reference/host-demo-apps ];
-    reference-personalize.imports = [ ./reference/personalize ];
-    reference-profiles.imports = [ ./reference/profiles ];
-    reference-programs.imports = [ ./reference/programs ];
-    reference-services.imports = [ ./reference/services ];
-  };
 }
diff --git a/modules/hardware/common/default.nix b/modules/hardware/common/default.nix
@@ -9,6 +9,5 @@
     ./input.nix
     ./kernel.nix
     ./qemu.nix
-    ./shared-mem.nix
   ];
 }
diff --git a/modules/hardware/common/devices.nix b/modules/hardware/common/devices.nix
@@ -2,7 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 { config, lib, ... }:
 let
-  inherit (lib) mkOption types mkForce;
+  inherit (lib)
+    mkOption
+    types
+    mkForce
+    concatMapStringsSep
+    ;
 in
 {
   options.ghaf.hardware.devices = {
@@ -45,7 +50,12 @@ in
             inherit (d) path;
           }) config.ghaf.hardware.definition.network.pciDevices
         );
-        ghaf.hardware.definition.network.pciDevices = config.ghaf.hardware.definition.network.pciDevices;
+        services.udev.extraRules = ''
+          ${concatMapStringsSep "/n" (
+            d:
+            ''SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x${d.vendorId}", ATTRS{device}=="0x${d.productId}", NAME="${d.name}"''
+          ) config.ghaf.hardware.definition.network.pciDevices}
+        '';
       };
 
       guivmPCIPassthroughModule = {
@@ -55,7 +65,6 @@ in
             inherit (d) path qemu;
           }) config.ghaf.hardware.definition.gpu.pciDevices
         );
-        ghaf.hardware.definition.gpu.pciDevices = config.ghaf.hardware.definition.gpu.pciDevices;
       };
 
       audiovmPCIPassthroughModule = {
@@ -65,7 +74,6 @@ in
             inherit (d) path;
           }) config.ghaf.hardware.definition.audio.pciDevices
         );
-        ghaf.hardware.definition.audio.pciDevices = config.ghaf.hardware.definition.audio.pciDevices;
       };
 
       guivmVirtioInputHostEvdevModule = {
diff --git a/modules/hardware/common/qemu.nix b/modules/hardware/common/qemu.nix
@@ -26,7 +26,7 @@ in
   };
 
   config = {
-    ghaf.qemu.guivm = optionalAttrs (hasAttr "hardware" config.ghaf) {
+    ghaf.qemu.guivm = optionalAttrs (config.ghaf.type == "host") {
       microvm.qemu.extraArgs =
         optionals (config.ghaf.hardware.definition.type == "laptop") [
           # Button
@@ -47,8 +47,13 @@ in
           "pcie-root-port,bus=pcie.0,id=${config.ghaf.hardware.usb.vhotplug.pcieBusPrefix}${toString n},chassis=${toString n}"
         ]) (lib.range 1 config.ghaf.hardware.usb.vhotplug.pciePortCount);
     };
-    ghaf.qemu.audiovm = optionalAttrs (hasAttr "hardware" config.ghaf) {
-      microvm.qemu.extraArgs = optionals (hasAttr "bt0" config.ghaf.hardware.usb.internal.qemuExtraArgs) config.ghaf.hardware.usb.internal.qemuExtraArgs.bt0;
+    ghaf.qemu.audiovm = optionalAttrs (config.ghaf.type == "host") {
+      microvm.qemu.extraArgs =
+        optionals (hasAttr "bt0" config.ghaf.hardware.usb.internal.qemuExtraArgs) config.ghaf.hardware.usb.internal.qemuExtraArgs.bt0
+        ++ optionals (config.ghaf.hardware.definition.audio.acpiPath != null) [
+          "-acpitable"
+          "file=${config.ghaf.hardware.definition.audio.acpiPath}"
+        ];
     };
   };
 }
diff --git a/modules/hardware/flake-module.nix b/modules/hardware/flake-module.nix
@@ -1,14 +1,8 @@
 # Copyright 2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
-
   flake.nixosModules = {
-    hardware-x86_64-laptop.imports = [
-      ./definition.nix
-      ./x86_64-generic
-      ./common
-    ];
-    hardware-x86_64-desktop.imports = [
+    hardware-x86_64-workstation.imports = [
       ./definition.nix
       ./x86_64-generic
       ./common
diff --git a/modules/microvm/flake-module.nix b/modules/microvm/flake-module.nix
@@ -4,7 +4,6 @@
 {
   flake.nixosModules = {
     microvm.imports = [
-      inputs.microvm.nixosModules.host
       (import ./host/microvm-host.nix { inherit inputs; })
       (import ./sysvms/netvm.nix { inherit inputs; })
       (import ./sysvms/adminvm.nix { inherit inputs; })
@@ -14,12 +13,12 @@
       (import ./sysvms/idsvm/idsvm.nix { inherit inputs; })
       ./sysvms/idsvm/mitmproxy
       ./modules.nix
-      ../hardware/common/shared-mem.nix
     ];
 
     mem-manager.imports = [
-      ./mem-manager.nix
+      ./host/mem-manager.nix
     ];
+
     vm-modules.imports = [
       ./common/ghaf-audio.nix
       ./common/shared-directory.nix
diff --git a/modules/microvm/host/mem-manager.nix b/modules/microvm/host/mem-manager.nix
diff --git a/modules/microvm/host/microvm-host.nix b/modules/microvm/host/microvm-host.nix
@@ -22,9 +22,12 @@ let
 in
 {
   imports = [
+    inputs.microvm.nixosModules.host
     inputs.impermanence.nixosModules.impermanence
     inputs.self.nixosModules.givc
+    inputs.self.nixosModules.mem-manager
     ./networking.nix
+    ./shared-mem.nix
   ];
 
   options.ghaf.virtualization.microvm-host = {
diff --git a/modules/microvm/host/shared-mem.nix b/modules/microvm/host/shared-mem.nix
diff --git a/modules/microvm/sysvms/audiovm.nix b/modules/microvm/sysvms/audiovm.nix
@@ -9,7 +9,6 @@
 let
   configHost = config;
   vmName = "audio-vm";
-  has_acpi_path = config.ghaf.hardware.definition.audio.acpiPath != null;
 
   audiovmBaseConfiguration = {
     imports = [
@@ -108,15 +107,10 @@ let
                   aarch64-linux = "virt";
                 }
                 .${configHost.nixpkgs.hostPlatform.system};
-              extraArgs =
-                [
-                  "-device"
-                  "qemu-xhci"
-                ]
-                ++ lib.optionals has_acpi_path [
-                  "-acpitable"
-                  "file=${config.ghaf.hardware.definition.audio.acpiPath}"
-                ];
+              extraArgs = [
+                "-device"
+                "qemu-xhci"
+              ];
             };
           };
         }
diff --git a/modules/microvm/sysvms/netvm.nix b/modules/microvm/sysvms/netvm.nix
@@ -94,14 +94,6 @@ let
             };
           };
 
-          # WORKAROUND: Create a rule to temporary hardcode device name for Wi-Fi adapter on x86
-          # TODO this is a dirty hack to guard against adding this to Nvidia/vm targets which
-          # dont have that definition structure yet defined. FIXME.
-          # TODO the hardware.definition should not even be exposed in targets that do not consume it
-          services.udev.extraRules = lib.mkIf (config.ghaf.hardware.definition.network.pciDevices != [ ]) ''
-            SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x${(lib.head config.ghaf.hardware.definition.network.pciDevices).vendorId}", ATTRS{device}=="0x${(lib.head config.ghaf.hardware.definition.network.pciDevices).productId}", NAME="${(lib.head config.ghaf.hardware.definition.network.pciDevices).name}"
-          '';
-
           microvm = {
             # Optimize is disabled because when it is enabled, qemu is built without libusb
             optimize.enable = false;
diff --git a/modules/profiles/flake-module.nix b/modules/profiles/flake-module.nix
@@ -17,11 +17,10 @@
 
     # speciic profiles that are needed for certain classes of devices should be included below.
     # This can be on a category basis or integrated into an existing category if it has a common base
-    profiles-laptop.imports = [
+    profiles-workstation.imports = [
       inputs.self.nixosModules.profiles
-      ./laptop-x86.nix
       inputs.self.nixosModules.microvm
-      inputs.self.nixosModules.mem-manager
+      ./laptop-x86.nix
     ];
   };
 }
diff --git a/modules/reference/flake-module.nix b/modules/reference/flake-module.nix
@@ -0,0 +1,23 @@
+# Copyright 2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+{ inputs, ... }:
+{
+  flake.nixosModules = {
+    reference-appvms.imports = [ ./appvms ];
+    reference-desktop.imports = [ ./desktop ];
+    reference-host-demo-apps.imports = [ ./host-demo-apps ];
+    reference-personalize.imports = [ ./personalize ];
+    reference-programs.imports = [ ./programs ];
+    reference-services.imports = [ ./services ];
+    reference-profiles.imports = [
+      inputs.self.nixosModules.reference-appvms
+      inputs.self.nixosModules.reference-programs
+      inputs.self.nixosModules.reference-services
+      inputs.self.nixosModules.reference-personalize
+      inputs.self.nixosModules.reference-desktop
+      ./profiles/mvp-user-trial.nix
+      ./profiles/mvp-user-trial-extras.nix
+    ];
+  };
+}
diff --git a/modules/reference/hardware/flake-module.nix b/modules/reference/hardware/flake-module.nix
@@ -7,7 +7,7 @@
 {
   flake.nixosModules = {
     hardware-alienware-m18-r2.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./alienware/alienware-m18.nix;
         ghaf.virtualization.microvm.guivm.extraModules = [
@@ -19,27 +19,27 @@
       }
     ];
     hardware-dell-latitude-7230.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./dell-latitude/definitions/dell-latitude-7230.nix;
       }
     ];
     hardware-dell-latitude-7330-72.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./dell-latitude/definitions/dell-latitude-7330-72.nix;
       }
     ];
     # New variant as network device may enumerate on different PCI BUS on same model of Dell 7330
     # TODO: Remove once we can have better way to detect network PCI device
     hardware-dell-latitude-7330-71.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./dell-latitude/definitions/dell-latitude-7330-71.nix;
       }
     ];
     hardware-demo-tower-mk1.imports = [
-      inputs.self.nixosModules.hardware-x86_64-desktop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./demo-tower/demo-tower.nix;
         ghaf.hardware.tpm2.enable = lib.mkForce false;
@@ -50,19 +50,19 @@
     ];
 
     hardware-lenovo-x1-carbon-gen10.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./lenovo-x1/definitions/x1-gen10.nix;
       }
     ];
     hardware-lenovo-x1-carbon-gen11.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./lenovo-x1/definitions/x1-gen11.nix;
       }
     ];
     hardware-lenovo-x1-carbon-gen12.imports = [
-      inputs.self.nixosModules.hardware-x86_64-laptop
+      inputs.self.nixosModules.hardware-x86_64-workstation
       {
         ghaf.hardware.definition = import ./lenovo-x1/definitions/x1-gen12.nix;
       }
diff --git a/modules/reference/profiles/default.nix b/modules/reference/profiles/default.nix
diff --git a/modules/reference/profiles/mvp-user-trial.nix b/modules/reference/profiles/mvp-user-trial.nix
@@ -5,14 +5,6 @@ let
   cfg = config.ghaf.reference.profiles.mvp-user-trial;
 in
 {
-  imports = [
-    ../appvms
-    ../programs
-    ../services
-    ../personalize
-    ../desktop
-  ];
-
   options.ghaf.reference.profiles.mvp-user-trial = {
     enable = lib.mkEnableOption "Enable the mvp configuration for apps and services";
   };
diff --git a/modules/reference/services/chromecast/chromecast-config.nix b/modules/reference/services/chromecast/chromecast-config.nix
@@ -1,19 +1,17 @@
 # Copyright 2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 { config, lib, ... }:
+let
+  inherit (lib) optionalAttrs hasAttrByPath;
+  isHost = hasAttrByPath [
+    "hardware"
+    "devices"
+  ] config.ghaf;
+in
 {
-  config.ghaf.reference.services.chromecast =
-    let
-      externalNic =
-        let
-          firstPciWifiDevice = lib.head config.ghaf.hardware.definition.network.pciDevices;
-        in
-        "${firstPciWifiDevice.name}";
-      internalNic = "ethint0";
-    in
-    {
-      enable = lib.mkDefault false;
-      inherit externalNic;
-      inherit internalNic;
-    };
+  config.ghaf.reference.services.chromecast = optionalAttrs isHost {
+    enable = lib.mkDefault false;
+    externalNic = (lib.head config.ghaf.hardware.definition.network.pciDevices).name;
+    internalNic = "ethint0";
+  };
 }
diff --git a/modules/reference/services/dendrite-pinecone/dendrite-config.nix b/modules/reference/services/dendrite-pinecone/dendrite-config.nix
diff --git a/packages/flake-module.nix b/packages/flake-module.nix
diff --git a/targets/laptop/laptop-configuration-builder.nix b/targets/laptop/laptop-configuration-builder.nix

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`#`
`4`	`4`	`# Modules to be exported from Flake`
`5`	`5`	`#`
`6`		`-{ ... }:`
`7`	`6`	`{`
`8`	`7`	`imports = [`
`9`	`8`	`./partitioning/flake-module.nix`
`@@ -15,15 +14,6 @@`
`15`	`14`	`./common/flake-module.nix`
`16`	`15`	`./development/flake-module.nix`
`17`	`16`	`./desktop/flake-module.nix`
	`17`	`+ ./reference/flake-module.nix`
`18`	`18`	`];`
`19`		`-`
`20`		`- flake.nixosModules = {`
`21`		`- #TODO: Add the rest of the modules in their own directories with flake-module.nix`
`22`		`- reference-appvms.imports = [ ./reference/appvms ];`
`23`		`- reference-host-demo-apps.imports = [ ./reference/host-demo-apps ];`
`24`		`- reference-personalize.imports = [ ./reference/personalize ];`
`25`		`- reference-profiles.imports = [ ./reference/profiles ];`
`26`		`- reference-programs.imports = [ ./reference/programs ];`
`27`		`- reference-services.imports = [ ./reference/services ];`
`28`		`- };`
`29`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,5 @@`
`9`	`9`	`./input.nix`
`10`	`10`	`./kernel.nix`
`11`	`11`	`./qemu.nix`
`12`		`- ./shared-mem.nix`
`13`	`12`	`];`
`14`	`13`	`}`