nixos: disko: simplify

This commit is contained in:
Guanran Wang 2024-01-13 15:20:06 +08:00
parent 24f5667327
commit dc4ad8f939
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8

View file

@ -14,11 +14,7 @@
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
mountOptions = [ mountOptions = ["defaults" "umask=007"];
"defaults"
"fmask=0077"
"dmask=0077"
];
}; };
}; };
"luks" = { "luks" = {
@ -29,14 +25,16 @@
settings.allowDiscards = true; settings.allowDiscards = true;
content = { content = {
type = "btrfs"; type = "btrfs";
subvolumes = { subvolumes = let
mountOptions = ["defaults" "compress=zstd" "noatime"];
in {
"/@nix" = { "/@nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = ["defaults" "compress=zstd" "noatime"]; inherit mountOptions;
}; };
"/@persist" = { "/@persist" = {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = ["defaults" "compress=zstd" "noatime"]; inherit mountOptions;
}; };
}; };
}; };