From 9c6daafda74e18ff33f97d90f5ae958d693f85e0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 15 May 2021 16:13:19 +0200 Subject: root@installer: fix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index e2567e84..5204b447 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,7 @@ users = recImport rec { dir = ./users; _import = mkUserModule dir; }; userProfiles = forAllUsers (userName: recImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; }); accounts = recursiveUpdate rootAccounts (recImport rec { dir = ./accounts; _import = mkAccountModule dir; }); - rootAccounts = mapAttrs' (hostName: _value: nameValuePair "root@${hostName}" ({...}: { imports = [ self.nixosModules.users.root or ({...}: { imports = defaultUserProfiles "root"; }) ]; })) self.nixosConfigurations; + rootAccounts = listToAttrs (map (hostName: nameValuePair "root@${hostName}" ({...}: { imports = [ self.nixosModules.users.root or ({...}: { imports = defaultUserProfiles "root"; }) ]; })) (attrNames self.nixosConfigurations ++ lib.optional (installers != {}) "installer" )); in modulesAttrs // { inherit systemProfiles users userProfiles accounts; }; nixosConfigurations = recImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; }; -- cgit v1.2.3