koishi/nixos
1
0
Fork 0
Code Issues Pull requests Projects Activity

fix(fs): add missing fs options

Browse source
This commit is contained in:
514fpv 2024-02-10 00:20:43 +08:00
parent 189eabe42c
commit 4ba694da03
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
global/fs/zfs/default.nix
View file

@ -37,6 +37,10 @@ in {
type = with types; str; type = with types; str;
description = "UUID of secret filesystem"; description = "UUID of secret filesystem";
}; };
store = mkOption {
type = with types; str;
description = "UUID of store filesystem";
};
}; };
}; };

10
global/fs/zfs/split.nix
View file

@ -13,7 +13,7 @@ in mkIf cfg.enable {
PROGRAM ${cfg.mdProg} PROGRAM ${cfg.mdProg}
''; '';
# secret filesystem backed by LUKS on swraid # secret filesystem backed by swraid
fileSystems."/nix/var/secret" = fileSystems."/nix/var/secret" =
{ device = "/dev/disk/by-uuid/${cfg.secret}"; { device = "/dev/disk/by-uuid/${cfg.secret}";
fsType = "ext4"; fsType = "ext4";
@ -22,6 +22,14 @@ in mkIf cfg.enable {
depends = [ "/nix/var" ]; depends = [ "/nix/var" ];
}; };
# external store backed by swraid
global.fs = {
zfs.externalStore = mkDefault true;
external.device = "/dev/disk/by-uuid/${cfg.store}";
external.fsType = "xfs";
external.options = [ "noatime" ];
};
# import system state pool after encrypted filesystems become available for key loading # import system state pool after encrypted filesystems become available for key loading
boot.initrd.systemd.services."zfs-import-${config.global.fs.store}".after = [ "cryptsetup.target" ]; boot.initrd.systemd.services."zfs-import-${config.global.fs.store}".after = [ "cryptsetup.target" ];
} }