move hardware profiles

flake.nix

@@ -5,8 +5,8 @@
     let
 
       mypkgs = import ./pkgs;
-      getHosts = import lib/hosts.nix;
       morphHosts = import lib/morph.nix;
+      hardware = import lib/hardware.nix;
 
       forAllSystems = f: builtins.listToAttrs (map
         (name: { inherit name; value = f name; })
@@ -23,7 +23,7 @@
 
     in
     {
-      lib = { inherit forAllSystems getHosts morphHosts; };
+      lib = { inherit forAllSystems morphHosts hardware; };
 
       nixosModules =
         { inherit pins; } //
@@ -39,13 +39,7 @@
         nixpkgs.overlays = [ (_: mypkgs) ];
       };
 
-      nixosConfigurations =
+      nixosConfigurations = import ./hosts nixpkgs hardware self.nixosModule;
-        builtins.mapAttrs
-          (_: nixpkgs.lib.nixosSystem)
-          (getHosts {
-            inherit (self) nixosModule;
-            path = ./hosts;
-          });
 
       packages = forAllSystems
         (system: mypkgs nixpkgs.legacyPackages.${system});

hosts/default.nix

@@ -0,0 +1,17 @@
+nixpkgs: hardware: nixosModule:
+with hardware;
+
+let
+  sys = args: nixpkgs.lib.nixosSystem {
+    system = builtins.head args;
+    modules = [ nixosModule ] ++ builtins.tail args;
+  };
+
+in
+{
+  cube = sys [ "x86_64-linux" physical ./x86_64-linux/cube ];
+  hp = sys [ "x86_64-linux" physical ./x86_64-linux/hp ];
+  lenny = sys [ "x86_64-linux" physical ./x86_64-linux/lenny ];
+  nixdev = sys [ "x86_64-linux" qemu ./x86_64-linux/nixdev ];
+  slate = sys [ "x86_64-linux" physical ./x86_64-linux/slate ];
+}

hosts/x86_64-linux/cube/default.nix

@@ -1,9 +1,10 @@
 { pkgs, ... }:
 {
+  networking.hostName = "cube";
+
   sconfig = {
     gnome = true;
     profile = "desktop";
-    hardware = "physical";
   };
 
   environment.etc =

hosts/x86_64-linux/hp/default.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  networking.hostName = "hp";
+
   services = {
     openssh.enable = true;
   };
@@ -21,7 +23,6 @@
   sconfig = {
     gnome = true;
     profile = "desktop";
-    hardware = "physical";
   };
 
   environment.systemPackages = [ pkgs.vmware-horizon-client ];

hosts/x86_64-linux/lenny/default.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  networking.hostName = "lenny";
+
   services = {
     openssh.enable = true;
   };
@@ -21,7 +23,6 @@
   sconfig = {
     gnome = true;
     profile = "desktop";
-    hardware = "physical";
   };
 
   environment.systemPackages = [ pkgs.vmware-horizon-client ];

hosts/x86_64-linux/nixdev/default.nix

@@ -1,8 +1,9 @@
 { config, lib, pkgs, ... }:
 {
+  networking.hostName = "nixdev";
+
   sconfig = {
     gnome = true;
-    hardware = "qemu";
     profile = "desktop";
   };
 

hosts/x86_64-linux/slate/default.nix

@@ -1,8 +1,9 @@
 { pkgs, ... }:
 {
+  networking.hostName = "slate";
+
   sconfig = {
     profile = "desktop";
-    hardware = "physical";
     gnome = true;
   };
 

lib/hardware.nix

@@ -0,0 +1,20 @@
+{
+  physical = { lib, modulesPath, ... }: lib.mkMerge
+    [
+      (import "${modulesPath}/installer/scan/not-detected.nix" { inherit lib; })
+      { hardware.cpu.amd.updateMicrocode = true; }
+      { hardware.cpu.intel.updateMicrocode = true; }
+    ];
+
+  qemu = { lib, modulesPath, ... }: lib.mkMerge
+    [
+      (import "${modulesPath}/profiles/qemu-guest.nix" { })
+      { services.qemuGuest.enable = true; }
+    ];
+
+  vmware = { lib, modulesPath, ... }: lib.mkMerge
+    [
+      { virtualisation.vmware.guest.enable = true; }
+      { boot.initrd.availableKernelModules = [ "mptspi" ]; }
+    ];
+}

modules/hardware.nix

@@ -1,39 +0,0 @@
-{ config, lib, modulesPath, ... }:
-let
-
-  hardwareFor = name: cfg:
-    lib.mkIf
-      (config.sconfig.hardware == name)
-      (lib.mkMerge cfg);
-
-  hardwareModules =
-    [
-      (hardwareFor "qemu"
-        [
-          (import "${modulesPath}/profiles/qemu-guest.nix" { })
-          { services.qemuGuest.enable = true; }
-        ])
-
-      (hardwareFor "vmware"
-        [
-          { virtualisation.vmware.guest.enable = true; }
-          { boot.initrd.availableKernelModules = [ "mptspi" ]; }
-        ])
-
-      (hardwareFor "physical"
-        [
-          (import "${modulesPath}/installer/scan/not-detected.nix" { inherit lib; })
-          { hardware.cpu.amd.updateMicrocode = true; }
-          { hardware.cpu.intel.updateMicrocode = true; }
-        ])
-    ];
-
-in
-with lib;
-{
-  options.sconfig.hardware = mkOption {
-    type = types.enum [ "physical" "vmware" "qemu" ];
-  };
-
-  config = mkMerge hardwareModules;
-}