use disk option instead

This commit is contained in:
twoneis 2024-07-21 01:43:53 +02:00
parent 90498a5c84
commit 7b7d7a0c55
3 changed files with 13 additions and 6 deletions

View file

@ -14,7 +14,7 @@
boot = { boot = {
initrd = { initrd = {
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ];
luks.devices.root.device = "/dev/disk/by-uuid/747ae319-f189-44f5-9737-a42672e2c02d"; luks.devices.root.device = "/dev/disk/by-uuid/${config.disks.crypt}";
}; };
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
@ -30,21 +30,21 @@
fileSystems = { fileSystems = {
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/4672-C1A9"; device = "/dev/disk/by-uuid/${config.disks.boot}";
fsType = "vfat"; fsType = "vfat";
}; };
"/" = { "/" = {
device = "/dev/disk/by-uuid/04255623-c061-4cf0-89fa-b3d8eb239d59"; device = "/dev/disk/by-uuid/${config.disks.root}";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" "noatime" ]; options = [ "subvol=root" "compress=zstd" "noatime" ];
}; };
"/nix" = { "/nix" = {
device = "/dev/disk/by-uuid/04255623-c061-4cf0-89fa-b3d8eb239d59"; device = "/dev/disk/by-uuid/${config.disks.root}";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" ]; options = [ "subvol=nix" "compress=zstd" "noatime" ];
}; };
"/swap" = { "/swap" = {
device = "/dev/disk/by-uuid/04255623-c061-4cf0-89fa-b3d8eb239d59"; device = "/dev/disk/by-uuid/${config.disks.root}";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=swap" "noatime" ]; options = [ "subvol=swap" "noatime" ];
}; };

View file

@ -0,0 +1,7 @@
{ ... }: {
disks = {
crypt = "747ae319-f189-44f5-9737-a42672e2c02d";
boot = "4672-C1A9";
root = "04255623-c061-4cf0-89fa-b3d8eb239d59";
};
}

View file

@ -1,5 +1,5 @@
{ ... }: { { ... }: {
user = true; full = true;
withNiri = true; withNiri = true;
withGnome = false; withGnome = false;