refactor 2/2: simplify hosts layout

flake.nix

@@ -56,9 +56,18 @@
           })
           (builtins.readDir ./modules);
 
-      nixosConfigurations = builtins.mapAttrs
+      nixosConfigurations = lib.genAttrs
-        (_: lib.nixosSystem)
+        (builtins.attrNames (builtins.readDir ./hosts))
-        (import ./hosts { imports = builtins.attrValues self.nixosModules; });
+        (name:
+          let cfg = import (./hosts + "/${name}");
+          in lib.nixosSystem {
+            inherit (cfg) system;
+            modules =
+              cfg.modules ++
+              [{ networking.hostName = name; }] ++
+              (builtins.attrValues self.nixosModules);
+          }
+        );
 
       packages = forAllSystems (system:
         mypkgs nixpkgs.legacyPackages.${system});

hosts/default.nix

@@ -1,18 +0,0 @@
-nixosModule:
-
-builtins.mapAttrs
-
-  (name: system: {
-    inherit system;
-    modules = [
-      nixosModule
-      (./. + "/${name}")
-      { networking.hostName = name; }
-    ];
-  })
-
-{
-  hp = "x86_64-linux";
-  levi = "x86_64-linux";
-  testbox = "x86_64-linux";
-}

hosts/hp/default.nix

@@ -0,0 +1,6 @@
+{
+  system = "x86_64-linux";
+  modules = [
+    ./configuration.nix
+  ];
+}

hosts/levi/default.nix

@@ -0,0 +1,6 @@
+{
+  system = "x86_64-linux";
+  modules = [
+    ./configuration.nix
+  ];
+}

hosts/testbox/default.nix

@@ -0,0 +1,6 @@
+{
+  system = "x86_64-linux";
+  modules = [
+    ./configuration.nix
+  ];
+}