diff options
| -rw-r--r-- | flake.nix | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -30,7 +30,7 @@ | |||
| 30 | inherit (nixpkgs) lib; | 30 | inherit (nixpkgs) lib; |
| 31 | utils = import ./utils { inherit lib; }; | 31 | utils = import ./utils { inherit lib; }; |
| 32 | inherit (utils) recImport overrideModule; | 32 | inherit (utils) recImport overrideModule; |
| 33 | inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique; | 33 | inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem; |
| 34 | 34 | ||
| 35 | accountUserName = accountName: | 35 | accountUserName = accountName: |
| 36 | let | 36 | let |
| @@ -60,7 +60,7 @@ | |||
| 60 | }; | 60 | }; |
| 61 | accountModules = attrValues (filterAttrs accountMatchesHost self.nixosModules.accounts); | 61 | accountModules = attrValues (filterAttrs accountMatchesHost self.nixosModules.accounts); |
| 62 | accountMatchesHost = n: _v: accountHostName n == hostName; | 62 | accountMatchesHost = n: _v: accountHostName n == hostName; |
| 63 | in [ argsModule ] ++ defaultProfiles ++ [ local ] ++ accountModules; | 63 | in attrValues (filterAttrs (n: _v: !(elem n ["systemProfiles" "users" "userProfiles" "accounts"])) self.nixosModules) ++ [ argsModule ] ++ defaultProfiles ++ [ local ] ++ accountModules; |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | mkSystemProfile = dir: path: profileName: { | 66 | mkSystemProfile = dir: path: profileName: { |
