flake-parts/setups: refactor

modules/flake-parts/setups/home-manager.nix

@@ -251,18 +251,17 @@ in
                   )
                   metadata.systems);
           in
-          lib.mapAttrs
+          lib.mapAttrs generatePureConfigs cfg.configs;
-            (hostname: metadata:
-              generatePureConfigs hostname metadata)
-            cfg.configs;
       in
       {
         homeConfigurations =
+          let
+            renameSystems = name: system: config:
+              lib.nameValuePair "${name}-${system}" config;
+          in
           lib.concatMapAttrs
             (name: configs:
-              lib.mapAttrs'
+              lib.mapAttrs' (renameSystems name) configs)
-                (system: config: lib.nameValuePair "${name}-${system}" config)
-                configs)
             pureHomeManagerConfigs;
 
         deploy.nodes =
@@ -271,12 +270,9 @@ in
               lib.filterAttrs
                 (name: _: cfg.configs.${name}.deploy != null)
                 pureHomeManagerConfigs;
-          in
+
-          lib.concatMapAttrs
+            generateDeployNode = name: system: config:
-            (name: configs:
+              lib.nameValuePair "home-manager-${name}-${system}" (
-              lib.mapAttrs'
-                (system: config: lib.nameValuePair "home-manager-${name}-${system}"
-                  (
                 let
                   deployConfig = cfg.configs.${name}.deploy;
                   deployConfig' = lib.attrsets.removeAttrs deployConfig [ "profiles" ];
@@ -288,8 +284,11 @@ in
                         inherit name config system;
                       };
                   }
-                  ))
+              );
-                  configs)
+          in
+          lib.concatMapAttrs
+            (name: configs:
+              lib.mapAttrs' (generateDeployNode name) configs)
             validConfigs;
       };
   };

modules/flake-parts/setups/nixos.nix

@@ -330,18 +330,17 @@ in
                   )
                   metadata.systems);
           in
-          lib.mapAttrs
+          lib.mapAttrs generatePureConfigs validConfigs;
-            (hostname: metadata:
-              generatePureConfigs hostname metadata)
-            validConfigs;
       in
       {
         nixosConfigurations =
+          let
+            renameSystems = name: system: config:
+              lib.nameValuePair "${name}-${system}" config;
+          in
           lib.concatMapAttrs
             (name: configs:
-              lib.mapAttrs'
+              lib.mapAttrs' (renameSystems name) configs)
-                (system: config: lib.nameValuePair "${name}-${system}" config)
-                configs)
             pureNixosConfigs;
 
         deploy.nodes =
@@ -350,11 +349,9 @@ in
               lib.filterAttrs
                 (name: _: cfg.configs.${name}.deploy != null)
                 pureNixosConfigs;
-          in
+
-          lib.concatMapAttrs
+            generateDeployNode = name: system: config:
-            (name: configs:
+              lib.nameValuePair "nixos-${name}-${system}"
-              lib.mapAttrs'
-                (system: config: lib.nameValuePair "nixos-${name}-${system}"
                 (
                   let
                     deployConfig = cfg.configs.${name}.deploy;
@@ -367,8 +364,11 @@ in
                           inherit name config system;
                         };
                     }
-                  ))
+                );
-                configs)
+          in
+          lib.concatMapAttrs
+            (name: configs:
+              lib.mapAttrs' (generateDeployNode name) configs)
             validConfigs;
       };
 
@@ -382,23 +382,21 @@ in
 
           generateImages = name: metadata:
             let
-              images =
+              buildImage = format:
-                builtins.map
-                  (format:
                 lib.nameValuePair
                   "${name}-${format}"
                   (mkImage {
                     inherit (metadata) nixpkgsBranch;
                     inherit system format;
                     extraModules = cfg.sharedModules ++ metadata.modules;
-                      }))
+                  });
-                  metadata.formats;
+
+              images =
+                builtins.map buildImage metadata.formats;
             in
               lib.listToAttrs images;
         in
-        lib.concatMapAttrs
+        lib.concatMapAttrs generateImages validImages;
-          (name: metadata: generateImages name metadata)
-          validImages;
     };
   };
 }