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

cleanup: persist/private: encode the dependencies more precisely, rather than just having it all depend on default.target

Browse Source
This commit is contained in:
Colin
2024-08-02 04:50:33 +00:00
parent f925dd9a20
commit 515aab5370
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
{ config, lib, pkgs, sane-lib, utils, ... }:
let
# TODO: parameterize!
persist-base = "/nix/persist";
origin = config.sane.persist.stores."private".origin;
backing = sane-lib.path.concat [ persist-base "private" ];
@@ -112,15 +111,15 @@ lib.mkIf config.sane.persist.enable
};
# let sane.fs know about the mount
sane.fs."${origin}".mount = {};
sane.fs."${origin}".mount.depends = [
config.sane.fs."${backing}".unit
config.sane.fs."/run/gocryptfs".unit
];
# it also needs to know that the underlying device is an ordinary folder
sane.fs."${backing}" = sane-lib.fs.wanted {
dir.acl.user = config.sane.defaultUser;
};
sane.fs."/run/gocryptfs" = sane-lib.fs.wanted {
dir.acl.user = config.sane.defaultUser;
dir.acl.mode = "0700";
sane.fs."${backing}".dir.acl.user = config.sane.defaultUser;
sane.fs."/run/gocryptfs".dir.acl = {
user = config.sane.defaultUser;
mode = "0700";
};
# in order for non-systemd `mount` to work, the mount point has to already be created, so make that a default target