Standardize Disko formatting

This commit is contained in:
Bun 2025-05-05 23:26:44 -04:00
parent 38b6f0dbad
commit af67fc76d1
8 changed files with 90 additions and 27 deletions

View file

@ -54,21 +54,34 @@
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/prev" = { "/prev" = {
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ]; mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
# Impermanence # Impermanence
"/persist" = { "/persist" = {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/persist/.snapshots" = { }; "/persist/.snapshots" = { };
"/persist/home" = { }; "/persist/home" = { };

View file

@ -48,21 +48,34 @@
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/prev" = { "/prev" = {
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ]; mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
# Impermanence # Impermanence
"/persist" = { "/persist" = {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/persist/.snapshots" = { }; "/persist/.snapshots" = { };
"/persist/home" = { }; "/persist/home" = { };

View file

@ -48,21 +48,34 @@
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/prev" = { "/prev" = {
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ]; mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
# Impermanence # Impermanence
"/persist" = { "/persist" = {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/persist/.snapshots" = { }; "/persist/.snapshots" = { };
"/persist/home" = { }; "/persist/home" = { };

View file

@ -54,15 +54,25 @@
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/prev" = { "/prev" = {
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ]; mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
}; };
}; };
@ -78,7 +88,4 @@
}; };
}; };
}; };
# Needed for impermanence
fileSystems."/persist".neededForBoot = true;
} }

View file

@ -7,7 +7,6 @@
neededForBoot = true; neededForBoot = true;
options = [ options = [
"compress=zstd" "compress=zstd"
"noatime"
"subvol=persist" "subvol=persist"
]; ];
}; };

View file

@ -48,21 +48,34 @@
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/prev" = { "/prev" = {
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ]; mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
# Impermanence # Impermanence
"/persist" = { "/persist" = {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [
"compress=zstd"
"ssd"
];
}; };
"/persist/.snapshots" = { }; "/persist/.snapshots" = { };
"/persist/home" = { }; "/persist/home" = { };

View file

@ -54,21 +54,24 @@
subvolumes = { subvolumes = {
"/root" = { "/root" = {
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ]; mountOptions = [ "compress=zstd" ];
}; };
"/prev" = { "/prev" = {
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" ]; mountOptions = [
"compress=zstd"
"noexec"
];
}; };
"/nix" = { "/nix" = {
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ]; mountOptions = [ "compress=zstd" ];
}; };
# Impermanence # Impermanence
"/persist" = { "/persist" = {
mountpoint = "/persist"; mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" ]; mountOptions = [ "compress=zstd" ];
}; };
"/persist/.snapshots" = { }; "/persist/.snapshots" = { };
"/persist/home" = { }; "/persist/home" = { };

View file

@ -7,6 +7,7 @@
"${config.networking.hostName}" = { "${config.networking.hostName}" = {
type = "disk"; type = "disk";
device = "/dev/nvme0n1"; device = "/dev/nvme0n1";
imageSize = "32G";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
@ -63,6 +64,7 @@
mountpoint = "/prev"; mountpoint = "/prev";
mountOptions = [ mountOptions = [
"compress=zstd" "compress=zstd"
"noexec"
"ssd" "ssd"
]; ];
}; };