nixos: disko: cleanup
This commit is contained in:
parent
9de12f1548
commit
185f08af82
1 changed files with 8 additions and 9 deletions
|
@ -7,7 +7,7 @@
|
||||||
content = {
|
content = {
|
||||||
type = "gpt";
|
type = "gpt";
|
||||||
partitions = {
|
partitions = {
|
||||||
"ESP" = {
|
"esp" = {
|
||||||
size = "2G";
|
size = "2G";
|
||||||
type = "EF00";
|
type = "EF00";
|
||||||
content = {
|
content = {
|
||||||
|
@ -26,20 +26,17 @@
|
||||||
content = {
|
content = {
|
||||||
type = "luks";
|
type = "luks";
|
||||||
name = "crypted";
|
name = "crypted";
|
||||||
extraOpenArgs = ["--allow-discards"];
|
settings.allowDiscards = true;
|
||||||
passwordFile = "/tmp/secret.key"; # Interactive
|
|
||||||
content = {
|
content = {
|
||||||
type = "btrfs";
|
type = "btrfs";
|
||||||
extraArgs = ["-f"];
|
|
||||||
mountpoint = "/btrfs";
|
|
||||||
subvolumes = {
|
subvolumes = {
|
||||||
"/@nix" = {
|
"/@nix" = {
|
||||||
mountpoint = "/nix";
|
mountpoint = "/nix";
|
||||||
mountOptions = ["compress=zstd" "noatime"];
|
mountOptions = ["defaults" "compress=zstd" "noatime"];
|
||||||
};
|
};
|
||||||
"/@persist" = {
|
"/@persist" = {
|
||||||
mountpoint = "/persist";
|
mountpoint = "/persist";
|
||||||
mountOptions = ["compress=zstd" "noatime"];
|
mountOptions = ["defaults" "compress=zstd" "noatime"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -50,7 +47,7 @@
|
||||||
content = {
|
content = {
|
||||||
type = "swap";
|
type = "swap";
|
||||||
randomEncryption = true;
|
randomEncryption = true;
|
||||||
resumeDevice = true; # resume from hiberation from this device
|
#resumeDevice = true; # resume from hiberation from this device
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -61,9 +58,11 @@
|
||||||
"/" = {
|
"/" = {
|
||||||
fsType = "tmpfs";
|
fsType = "tmpfs";
|
||||||
mountOptions = [
|
mountOptions = [
|
||||||
"size=2G"
|
|
||||||
"defaults"
|
"defaults"
|
||||||
|
"size=2G"
|
||||||
"mode=755"
|
"mode=755"
|
||||||
|
"nodev"
|
||||||
|
"nosuid"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue