colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

persist: prefer mkMerge instead of manually folding attrsets

Browse Source
This commit is contained in:
colin
2023-01-06 12:44:29 +00:00
parent d8cd0e1f57
commit b0950e90f4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/persist/computed.nix
View File

@@ -25,14 +25,13 @@ let
fixed-dirs = (fixDirs "/home/colin" unfixed-home-dirs) ++ (fixDirs "/" unfixed-sys-dirs); fixed-dirs = (fixDirs "/home/colin" unfixed-home-dirs) ++ (fixDirs "/" unfixed-sys-dirs);
dirToAttr = dir: { dirToAttrs = dir: {
name = dir.directory; "${dir.directory}" = {
value = {
inherit (dir) user group mode store; inherit (dir) user group mode store;
}; };
}; };
in in
{ {
# compute the `byPath` path => entry mapping from higher-level store => entry mappings. # compute the `byPath` path => entry mapping from higher-level store => entry mappings.
sane.persist.byPath = builtins.listToAttrs (map dirToAttr fixed-dirs); sane.persist.byPath = lib.mkMerge (map dirToAttrs fixed-dirs);
} }