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

sane.fs: simplify

Browse Source
This commit is contained in:
Colin
2024-09-30 10:12:47 +00:00
parent 50c52683ff
commit e29842aa9d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/fs/default.nix
View File

@@ -146,6 +146,8 @@ let
mkMountConfig = path: opt: let mkMountConfig = path: opt: let
fsEntry = config.fileSystems."${path}"; fsEntry = config.fileSystems."${path}";
in { in {
# create the mount point, with desired acl
systemd.tmpfiles.settings."00-10-sane-fs"."${path}".d = opt.generated.acl;
fileSystems."${path}" = { fileSystems."${path}" = {
device = opt.mount.bind; device = opt.mount.bind;
options = [ options = [
@@ -184,14 +186,10 @@ let
mkFsConfig = path: opt: lib.mkMerge ( mkFsConfig = path: opt: lib.mkMerge (
[{ lib.optional (opt.mount != null) (mkMountConfig path opt)
# satisfy mkTypedMerge ++ lib.optional (opt.dir != null) (mkDirConfig path opt)
systemd.tmpfiles.settings."00-10-sane-fs" = {}; ++ lib.optional (opt.file != null) (mkFileConfig path opt)
}] ++ lib.optional (opt.symlink != null) (mkSymlinkConfig path opt)
++ lib.optional (opt.mount != null) (mkMountConfig path opt)
++ lib.optional (opt.dir != null) (mkDirConfig path opt)
++ lib.optional (opt.file != null) (mkFileConfig path opt)
++ lib.optional (opt.symlink != null) (mkSymlinkConfig path opt)
); );
# return all ancestors of this path. # return all ancestors of this path.