foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-07 06:19:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

flake-parts/setups: refactor

Browse Source
This commit is contained in:
Gabriel Arazas 2024-01-17 14:02:02 +08:00
parent 8a9e20b5f4
commit d2993a367b
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
2 changed files with 56 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/flake-parts/setups/home-manager.nix
View File

@ -251,18 +251,17 @@ in
)
metadata.systems);
in
lib.mapAttrs
(hostname: metadata:
generatePureConfigs hostname metadata)
cfg.configs;
lib.mapAttrs generatePureConfigs cfg.configs;
in
{
homeConfigurations =
let
renameSystems = name: system: config:
lib.nameValuePair "${name}-${system}" config;
in
lib.concatMapAttrs
(name: configs:
lib.mapAttrs'
(system: config: lib.nameValuePair "${name}-${system}" config)
configs)
lib.mapAttrs' (renameSystems name) configs)
pureHomeManagerConfigs;
deploy.nodes =
@ -271,12 +270,9 @@ in
lib.filterAttrs
(name: _: cfg.configs.${name}.deploy != null)
pureHomeManagerConfigs;
in
lib.concatMapAttrs
(name: configs:
lib.mapAttrs'
(system: config: lib.nameValuePair "home-manager-${name}-${system}"
(
generateDeployNode = name: 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;
};
};

42
modules/flake-parts/setups/nixos.nix
View File

@ -330,18 +330,17 @@ in
)
metadata.systems);
in
lib.mapAttrs
(hostname: metadata:
generatePureConfigs hostname metadata)
validConfigs;
lib.mapAttrs generatePureConfigs validConfigs;
in
{
nixosConfigurations =
let
renameSystems = name: system: config:
lib.nameValuePair "${name}-${system}" config;
in
lib.concatMapAttrs
(name: configs:
lib.mapAttrs'
(system: config: lib.nameValuePair "${name}-${system}" config)
configs)
lib.mapAttrs' (renameSystems name) configs)
pureNixosConfigs;
deploy.nodes =
@ -350,11 +349,9 @@ in
lib.filterAttrs
(name: _: cfg.configs.${name}.deploy != null)
pureNixosConfigs;
in
lib.concatMapAttrs
(name: configs:
lib.mapAttrs'
(system: config: lib.nameValuePair "nixos-${name}-${system}"
generateDeployNode = name: 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 =
builtins.map
(format:
buildImage = 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
(name: metadata: generateImages name metadata)
validImages;
lib.concatMapAttrs generateImages validImages;
};
};
}