summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-01-02 16:51:29 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-01-03 20:18:01 +0100
commit7f7d02a3f03435d455c3373d4f655d0d5aa8369e (patch)
treefc4aa2847abae120f90e12b1138bd545daac78d5
parent3058034f82ba38314b9f4ce0f9b0055522c44f47 (diff)
downloadnixos-7f7d02a3f03435d455c3373d4f655d0d5aa8369e.tar
nixos-7f7d02a3f03435d455c3373d4f655d0d5aa8369e.tar.gz
nixos-7f7d02a3f03435d455c3373d4f655d0d5aa8369e.tar.bz2
nixos-7f7d02a3f03435d455c3373d4f655d0d5aa8369e.tar.xz
nixos-7f7d02a3f03435d455c3373d4f655d0d5aa8369e.zip
import all modules by default
-rw-r--r--flake.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/flake.nix b/flake.nix
index 52d4026d..a17c22fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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: {