From cd91eca6ca8eba1864cfb54a4d3f851dbeadfa0a Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 26 Aug 2023 01:16:17 -0400 Subject: lib: move back to mapHMUsers --- parts/lib/configs.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'parts') diff --git a/parts/lib/configs.nix b/parts/lib/configs.nix index b1413a8..a3c20a6 100644 --- a/parts/lib/configs.nix +++ b/parts/lib/configs.nix @@ -3,9 +3,9 @@ self, ... }: let - inherit (builtins) attrNames elemAt mapAttrs zipAttrsWith; + inherit (builtins) attrNames mapAttrs; inherit (inputs) nixpkgs hm; - inherit (nixpkgs.lib) genAttrs optional splitString; + inherit (nixpkgs.lib) genAttrs optional; mkSystemCfg = name: { profile, @@ -45,18 +45,9 @@ ++ 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; - genHMUsers = users: systems: zipAttrsWith (_: v: elemAt v 0) (map (genHMUsersForSys users) systems); + mapHMUsers = mapAttrs mkHMCfg; mapSystems = mapAttrs mkSystemCfg; -- cgit v1.2.3