Still working on the flakes...

2021-08-16 18:15:42 -07:00
parent b5f62d0459
commit 05ba61cb4e
2 changed files with 20 additions and 41 deletions
@@ -10,26 +10,23 @@
    home-manager.inputs.nixpkgs.follows = "nixpkgs";
  };

-  outputs = { nixpkgs, hosts, home-manager, ... }: with builtins;
-    {
-      nixosConfigurations = listToAttrs (map (hostname:
-        let
-          hostOpts = hosts.host-configs.${hostname};
-          pkgs = import nixpkgs { system = hostOpts.arch; };
+  outputs = { nixpkgs, hosts, home-manager, ... }: with builtins; let
+    mapAttrs = f: m: listToAttrs
+      (map (k: { name = k; value = f k m.${k}; }) (attrNames m));
+  in {
+    nixosConfigurations = mapAttrs (hostname: hostOpts: let
+      pkgs = import nixpkgs { system = hostOpts.arch; };

-        in {
-          name = hostname;
-          value = pkgs.lib.nixosSystem {
-            system = hostOpts.arch;
-            modules = [
-              (import ./initialize.nix {
-                hostname = hostname;
-                home-manager-package = home-manager;
-                pkgs = pkgs;
-                include-secrets = true;
-              })
-            ];
-          };
-        }) (attrNames hosts.host-configs));
-    };
+    in pkgs.lib.nixosSystem {
+      system = hostOpts.arch;
+      modules = [
+        (import ./initialize.nix {
+          hostname = hostname;
+          home-manager-package = home-manager;
+          pkgs = pkgs;
+          include-secrets = true;
+        })
+      ];
+    }) hosts.host-configs;
+  };
 }