chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use recursiveUpdate instead of //

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-12-05 21:37:11 +01:00
parent 9d943cf1b4
commit a88633b66c
No known key found for this signature in database
GPG key ID: 019E764B7184435A
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/nix.nix
View file

@ -95,11 +95,14 @@ in
]; ];
home-manager.users.charlotte = { ... }: home-manager.users.charlotte = { ... }:
(lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv) // lib.recursiveUpdate
(lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree) // (lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv)
(lib.optionalAttrs config.chvp.nix.enableNixIndex baseNixIndex); (lib.recursiveUpdate
(lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree)
(lib.optionalAttrs config.chvp.nix.enableNixIndex baseNixIndex));
home-manager.users.root = { ... }: home-manager.users.root = { ... }:
(lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv) // lib.recursiveUpdate
(lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv)
(lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree); (lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree);
}; };
} }