diff --git a/devices/pleniscenta/default.nix b/devices/pleniscenta/default.nix index 313c91b..2592d53 100644 --- a/devices/pleniscenta/default.nix +++ b/devices/pleniscenta/default.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: { imports = [ ./options.nix + ./disks.nix ]; nixpkgs.hostPlatform = "x86_64-linux"; @@ -10,7 +11,7 @@ boot = { initrd = { availableKernelModules = [ "ahci" "xhci_pci" "ums_realtek" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - luks.devices."root".device = "/dev/disk/by-uuid/470a6d23-9f08-4c4d-afbb-63d6df1ab6a6"; + luks.devices."root".device = "/dev/disk/by-uuid/${config.disks.crypt}"; }; kernelModules = [ "kvm-intel" ]; @@ -26,26 +27,26 @@ fileSystems = { "/boot" = { - device = "/dev/disk/by-uuid/4A39-D0DF"; + device = "/dev/disk/by-uuid/${config.disks.boot}"; fsType = "vfat"; }; "/" = { - device = "/dev/disk/by-uuid/75e6536a-4836-4f50-86b3-f9250edca3c0"; + device = "/dev/disk/by-uuid/${config.disks.root}"; fsType = "btrfs"; options = [ "subvol=root" "compress=zstd" "noatime" ]; }; "/nix" = { - device = "/dev/disk/by-uuid/75e6536a-4836-4f50-86b3-f9250edca3c0"; + device = "/dev/disk/by-uuid/${config.disks.root}"; fsType = "btrfs"; options = [ "subvol=nix" "compress=zstd" "noatime" ]; }; "/persist" = { - device = "/dev/disk/by-uuid/75e6536a-4836-4f50-86b3-f9250edca3c0"; + device = "/dev/disk/by-uuid/${config.disks.root}"; fsType = "btrfs"; options = [ "subvol=persist" "compress=zstd" "noatime" ]; }; "/swap" = { - device = "/dev/disk/by-uuid/75e6536a-4836-4f50-86b3-f9250edca3c0"; + device = "/dev/disk/by-uuid/${config.disk.root}"; fsType = "btrfs"; options = [ "subvol=swap" "noatime" ]; }; diff --git a/devices/pleniscenta/disks.nix b/devices/pleniscenta/disks.nix new file mode 100644 index 0000000..65d3540 --- /dev/null +++ b/devices/pleniscenta/disks.nix @@ -0,0 +1,5 @@ +{ ... }: { + crypt = "470a6d23-9f08-4c4d-afbb-63d6df1ab6a6"; + boot = "4A39-D0DF"; + root = "75e6536a-4836-4f50-86b3-f9250edca3c0"; +}