hosts/dunamis/disko/disk-main.nix: refactor

hosts/sarien/disko/default.nix: source dunamis/disko/disk-main.nix

Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
2025-06-04 12:57:36 +03:00
parent f5a5f4b87c
commit 672f28c75c
2 changed files with 9 additions and 23 deletions

View File

@ -28,42 +28,27 @@
name = "luks-main"; name = "luks-main";
initrdUnlock = true; initrdUnlock = true;
settings.allowDiscards = true; settings.allowDiscards = true;
content = { content = let
mountOptions = ["autodefrag" "compress-force=zstd" "noatime"];
in {
type = "btrfs"; type = "btrfs";
extraArgs = ["-f"]; extraArgs = ["-f"];
subvolumes = { subvolumes = {
"@nixos-root" = { "@nixos-root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ mountOptions = mountOptions ++ ["noexec"];
"autodefrag"
"compress=zstd"
"noatime"
"noexec"
];
}; };
"@home" = { "@home" = {
mountpoint = "/home"; mountpoint = "/home";
mountOptions = [ inherit mountOptions;
"autodefrag"
"compress=zstd"
"noatime"
];
}; };
"@storage" = { "@storage" = {
mountpoint = "/storage"; mountpoint = "/storage";
mountOptions = [ inherit mountOptions;
"autodefrag"
"compress=zstd"
"noatime"
];
}; };
"@nix" = { "@nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ inherit mountOptions;
"autodefrag"
"compress-force=zstd"
"noatime"
];
}; };
}; };
}; };

View File

@ -10,5 +10,6 @@ in {
mountOptions = ["rw" "nosuid" "nodev"]; mountOptions = ["rw" "nosuid" "nodev"];
}; };
}; };
disko.devices.disk.main = import ./disk-main.nix {inherit disk;}; # same partitioning setup
disko.devices.disk.main = import ../../dunamis/disko/disk-main.nix {inherit disk;};
} }