further improvements

flake.nix

@@ -76,32 +76,27 @@
           ++ (if isServer then [ ] else [ ./home ]);
         };
 
-      # Not exposed as flake outputs because they depend on specialArgs
+      nixosModules =
-      # if you add a host, make sure to add it to var/default.nix as well
+        lib.genAttrs var.desktops (host: mkModule { entry = ./host/${host}; })
-      nixosModules = {
+        // lib.genAttrs var.servers (
-        "solo" = mkModule { entry = ./host/solo; };
+          host:
-        "c2" = mkModule { entry = ./host/c2; };
+          mkModule {
-        "fw" = mkModule { entry = ./host/fw; };
+            entry = ./host/${host};
-        "roam" = mkModule {
-          entry = ./host/roam;
             isServer = true;
-        };
+          }
-      };
+        );
 
     in
     {
       nixosConfigurations =
-        let
+        lib.genAttrs var.desktops (
-          mkDesktop = host: {
+          host:
-            name = host;
+          nixpkgs.lib.nixosSystem {
-            value = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             inherit specialArgs;
-              modules = [ (nixosModules.${host}) ];
+            modules = [ nixosModules.${host} ];
-            };
+          }
-          };
+        )
-        in
-        lib.listToAttrs (map mkDesktop var.desktops)
         // {
           "test-vm" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
@@ -117,11 +112,10 @@
           };
         };
 
-      colmenaHive = colmena.lib.makeHive {
+      colmenaHive = colmena.lib.makeHive (
+        {
           meta = {
-          nixpkgs = import nixpkgs {
+            nixpkgs = import nixpkgs { system = "x86_64-linux"; };
-            system = "x86_64-linux";
-          };
             inherit specialArgs;
           };
           "roam" = {
@@ -131,22 +125,13 @@
             };
             imports = [ nixosModules."roam" ];
           };
-        "solo" = {
+        }
+        // lib.genAttrs var.desktops (host: {
           deployment.targetHost = null;
           deployment.allowLocalDeployment = true;
-          imports = [ nixosModules."solo" ];
+          imports = [ nixosModules.${host} ];
-        };
+        })
-        "c2" = {
+      );
-          deployment.targetHost = null;
-          deployment.allowLocalDeployment = true;
-          imports = [ nixosModules."c2" ];
-        };
-        "fw" = {
-          deployment.targetHost = null;
-          deployment.allowLocalDeployment = true;
-          imports = [ nixosModules."fw" ];
-        };
-      };
     }
     // flake-utils.lib.eachDefaultSystem (
       system: