diff --git a/devices/inkvine/default.nix b/devices/inkvine/default.nix index 9d365aa..2d9adf1 100644 --- a/devices/inkvine/default.nix +++ b/devices/inkvine/default.nix @@ -14,7 +14,7 @@ boot = { initrd = { 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" ]; @@ -30,21 +30,21 @@ fileSystems = { "/boot" = { - device = "/dev/disk/by-uuid/4672-C1A9"; + device = "/dev/disk/by-uuid/${config.disks.boot}"; fsType = "vfat"; }; "/" = { - device = "/dev/disk/by-uuid/04255623-c061-4cf0-89fa-b3d8eb239d59"; + device = "/dev/disk/by-uuid/${config.disks.root}"; fsType = "btrfs"; options = [ "subvol=root" "compress=zstd" "noatime" ]; }; "/nix" = { - device = "/dev/disk/by-uuid/04255623-c061-4cf0-89fa-b3d8eb239d59"; + device = "/dev/disk/by-uuid/${config.disks.root}"; fsType = "btrfs"; options = [ "subvol=nix" "compress=zstd" "noatime" ]; }; "/swap" = { - device = "/dev/disk/by-uuid/04255623-c061-4cf0-89fa-b3d8eb239d59"; + device = "/dev/disk/by-uuid/${config.disks.root}"; fsType = "btrfs"; options = [ "subvol=swap" "noatime" ]; }; diff --git a/devices/inkvine/disks.nix b/devices/inkvine/disks.nix new file mode 100644 index 0000000..8e45d54 --- /dev/null +++ b/devices/inkvine/disks.nix @@ -0,0 +1,7 @@ +{ ... }: { + disks = { + crypt = "747ae319-f189-44f5-9737-a42672e2c02d"; + boot = "4672-C1A9"; + root = "04255623-c061-4cf0-89fa-b3d8eb239d59"; + }; +} diff --git a/devices/inkvine/options.nix b/devices/inkvine/options.nix index fa09f56..86b4d00 100644 --- a/devices/inkvine/options.nix +++ b/devices/inkvine/options.nix @@ -1,5 +1,5 @@ { ... }: { - user = true; + full = true; withNiri = true; withGnome = false;