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

refactor: persist: remove dead code

Browse Source
This commit is contained in:
Colin 2023-01-30 10:51:41 +00:00
parent ec22c128e0
commit e4bff9b5ef
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/persist/computed.nix
View File

@ -1,8 +0,0 @@
{ config, ... }:
let
cfg = config.sane.persist;
in
{
sane.persist.byPath = cfg.sys.byPath;
}

11
modules/persist/default.nix
View File

@ -184,14 +184,6 @@ in
default = {};
type = dirsSubModule;
};
sane.persist.byPath = mkOption {
type = types.attrsOf (convertInlineAcl entryAtPath);
# XXX: see computed.nix for definition
description = ''
map of <path> => <path config> for all paths to be persisted.
this is computed from the other options, but users can also set it explicitly (useful for overriding)
'';
};
sane.persist.stores = mkOption {
type = types.attrsOf storeType;
default = {};
@ -202,7 +194,6 @@ in
};
imports = [
./computed.nix
./root-on-tmpfs.nix
./stores
];
@ -243,7 +234,7 @@ in
);
}
];
configs = lib.mapAttrsToList cfgFor cfg.byPath;
configs = lib.mapAttrsToList cfgFor cfg.sys.byPath;
take = f: { sane.fs = f.sane.fs; };
in mkIf cfg.enable (
take (sane-lib.mkTypedMerge take configs)