Various fixes to sea-store

This commit is contained in:
niten 2021-10-17 23:33:07 -07:00
parent 41951b56ea
commit 0a6f6b794d
3 changed files with 7 additions and 7 deletions

View File

@ -43,10 +43,10 @@ in {
filesystem-type = "btrfs";
options = [ "noatime" "nodiratime" "compress=zstd" "noexec" ];
mountpoints = {
"/share/downloads" = {
"/export/downloads" = {
options = [ "subvol=@downloads" ];
};
"/share/documents" = {
"/export/documents" = {
options = [ "subvol=@documents" ];
};
};

View File

@ -12,10 +12,10 @@ in {
(fs: opts: { filesystem = fs; opts = opts; })
host-filesystems;
mounts = builtins.listToAttrs (concatMap
mounts = concatMap
(fs: mapAttrsToList
(mp: mp-opts:
nameValuePair "${fs.filesystem}-${mp}-mount" {
{
what = "/dev/mapper/${fs.filesystem}";
type = fs.opts.filesystem-type;
where = mp;
@ -25,8 +25,8 @@ in {
requires = [ "${fs.filesystem}-decrypt.service" ];
})
fs.opts.mountpoints)
filesystems);
in mounts;
filesystems;
in builtins.trace mounts mounts;
services = mapAttrs' (filesystem-name: opts:
nameValuePair "${filesystem-name}-decrypt"

View File

@ -41,7 +41,7 @@ rec {
};
options = mkOption {
type = str;
type = listOf str;
description = "List of filesystem options with which to mount.";
};