diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2021-05-15 16:13:19 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2021-05-15 16:13:19 +0200 |
commit | 9c6daafda74e18ff33f97d90f5ae958d693f85e0 (patch) | |
tree | 29476f04fa1bb67d10df6c5c00dad9e634d2d7b2 | |
parent | 99ee3e18f337218fff3bb2970df60e78978ef523 (diff) | |
download | nixos-9c6daafda74e18ff33f97d90f5ae958d693f85e0.tar nixos-9c6daafda74e18ff33f97d90f5ae958d693f85e0.tar.gz nixos-9c6daafda74e18ff33f97d90f5ae958d693f85e0.tar.bz2 nixos-9c6daafda74e18ff33f97d90f5ae958d693f85e0.tar.xz nixos-9c6daafda74e18ff33f97d90f5ae958d693f85e0.zip |
root@installer: fix
-rw-r--r-- | flake.nix | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -131,7 +131,7 @@ | |||
131 | users = recImport rec { dir = ./users; _import = mkUserModule dir; }; | 131 | users = recImport rec { dir = ./users; _import = mkUserModule dir; }; |
132 | userProfiles = forAllUsers (userName: recImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; }); | 132 | userProfiles = forAllUsers (userName: recImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; }); |
133 | accounts = recursiveUpdate rootAccounts (recImport rec { dir = ./accounts; _import = mkAccountModule dir; }); | 133 | accounts = recursiveUpdate rootAccounts (recImport rec { dir = ./accounts; _import = mkAccountModule dir; }); |
134 | rootAccounts = mapAttrs' (hostName: _value: nameValuePair "root@${hostName}" ({...}: { imports = [ self.nixosModules.users.root or ({...}: { imports = defaultUserProfiles "root"; }) ]; })) self.nixosConfigurations; | 134 | rootAccounts = listToAttrs (map (hostName: nameValuePair "root@${hostName}" ({...}: { imports = [ self.nixosModules.users.root or ({...}: { imports = defaultUserProfiles "root"; }) ]; })) (attrNames self.nixosConfigurations ++ lib.optional (installers != {}) "installer" )); |
135 | in modulesAttrs // { inherit systemProfiles users userProfiles accounts; }; | 135 | in modulesAttrs // { inherit systemProfiles users userProfiles accounts; }; |
136 | nixosConfigurations = recImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; }; | 136 | nixosConfigurations = recImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; }; |
137 | 137 | ||