nix
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/host-config/nostromo.nix
View File

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

8
lib/fudo/host-filesystems.nix
View File

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

2
lib/types/host.nix
View File

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