diff options
| author | seth <[email protected]> | 2023-08-25 11:44:17 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2023-08-25 11:46:03 -0400 |
| commit | ff2b42324c49dec6fe70e6161fb7288930a8aa98 (patch) | |
| tree | b4d92efc1fc2acf7c3bfa578dde325b0a68b8cba /parts/lib | |
| parent | 811c25ca3d5f1c732b46e658bbeca62878433c45 (diff) | |
lib/configs: replace mapHMUsers with genHMUsers
this mainly just flattens the layout of homeConfigurations from
homeConfigurations.<system>.name to homeConfigurations.<name>@<system>
Diffstat (limited to 'parts/lib')
| -rw-r--r-- | parts/lib/configs.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/parts/lib/configs.nix b/parts/lib/configs.nix index 5cc8b61..e3d4f31 100644 --- a/parts/lib/configs.nix +++ b/parts/lib/configs.nix @@ -3,9 +3,9 @@ self, ... }: let - inherit (builtins) attrNames mapAttrs; + inherit (builtins) attrNames elemAt mapAttrs; inherit (inputs) nixpkgs hm; - inherit (nixpkgs.lib) genAttrs optional; + inherit (nixpkgs.lib) genAttrs optional splitString zipAttrs; mkSystemCfg = name: { profile, @@ -25,7 +25,6 @@ }; mkHMCfg = name: { - nixpkgs ? nixpkgs, pkgs ? import nixpkgs {system = "x86_64-linux";}, extraSpecialArgs ? inputs, modules ? [], @@ -46,9 +45,22 @@ ++ optional pkgs.stdenv.isDarwin ../../users/${name}/darwin.nix ++ modules; }; + + genHMUsersForSys = users: system: let + users' = users system; + formattedUsers = map (u: "${u}@${system}") (attrNames users'); + in + genAttrs formattedUsers (user: let + name = elemAt (splitString "@" user) 0; + in + mkHMCfg name users'.${name}); in { inherit mkHMCfg mkSystemCfg; - mapHMUsers = mapAttrs mkHMCfg; + genHMUsers = users: systems: let + zipped = zipAttrs (map (genHMUsersForSys users) systems); + in + mapAttrs (_: v: elemAt v 0) zipped; # why do i need to do this??? ..i'm tired + mapSystems = mapAttrs mkSystemCfg; genHMModules = users: |