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

cleanup: persist/private: simplify

Browse Source
This commit is contained in:
Colin
2024-08-02 05:00:20 +00:00
parent 3eb66c098b
commit 6e5bde17aa
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/persist/stores/private.nix
View File

@@ -111,10 +111,13 @@ lib.mkIf config.sane.persist.enable
}; };
# let sane.fs know about the mount # let sane.fs know about the mount
sane.fs."${origin}".mount.depends = [ sane.fs."${origin}" = {
config.sane.fs."${backing}".unit mount.depends = [
config.sane.fs."/run/gocryptfs".unit config.sane.fs."${backing}".unit
]; config.sane.fs."/run/gocryptfs".unit
];
wantedBy = [ "local-fs.target" ];
};
# it also needs to know that the underlying device is an ordinary folder # it also needs to know that the underlying device is an ordinary folder
sane.fs."${backing}".dir.acl.user = config.sane.defaultUser; sane.fs."${backing}".dir.acl.user = config.sane.defaultUser;
sane.fs."/run/gocryptfs".dir.acl = { sane.fs."/run/gocryptfs".dir.acl = {
@@ -122,13 +125,6 @@ lib.mkIf config.sane.persist.enable
mode = "0700"; mode = "0700";
}; };
# in order for non-systemd `mount` to work, the mount point has to already be created, so make that a default target
systemd.units = let
originUnit = config.sane.fs."${origin}".generated.unit;
in {
"${originUnit}".wantedBy = [ "local-fs.target" ];
};
system.fsPackages = [ gocryptfs-private ]; system.fsPackages = [ gocryptfs-private ];
sane.user.services.gocryptfs-private = { sane.user.services.gocryptfs-private = {