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

fix(fs): improve zfs mountpoint handling

Browse source
This commit is contained in:
514fpv 2024-01-09 16:48:28 +08:00
parent 41b7ce03fb
commit 777d86ea2f
Signed by: koishi
SSH key fingerprint: SHA256:axz0uIzzY+5W19i7QOUuiw5LSqhKfCBKPf3L4xFRxLw
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
global/fs/zfs.nix
View file

@ -16,25 +16,25 @@ in {
defaults to nix store dataset defaults to nix store dataset
''; '';
}; };
mountpoints = mkOption {
type = with types; attrsOf str;
description = "zfs dataset mountpoints";
};
}; };
config = mkIf (cfg.type == "zfs") { config = mkIf (cfg.type == "zfs") {
fileSystems = { fileSystems = (mapAttrs (path: dataset: {
device = "${cfg.zfs.persist}/${dataset}";
fsType = "zfs";
# required by impermanence
neededForBoot = true;
}) cfg.zfs.mountpoints) // {
"/nix" = "/nix" =
{ device = "${cfg.store}/nix"; { device = "${cfg.store}/nix";
fsType = "zfs"; fsType = "zfs";
}; };
"/nix/persist" = };
{ device = "${cfg.zfs.persist}/persist"; global.fs.zfs.mountpoints."/nix/persist" = "persist";
fsType = "zfs";
neededForBoot = true;
};
} // (mapAttrs' (name: opts: nameValuePair
"/nix/persist/home/${name}" {
device = "${cfg.zfs.persist}/home/${name}";
fsType = "zfs";
neededForBoot = true;
}) (filterAttrs (n: _: n != "root") config.users.profiles));
services.zfs.trim.enable = true; services.zfs.trim.enable = true;
services.zfs.autoSnapshot.enable = true; services.zfs.autoSnapshot.enable = true;