tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Change nixos-desk from path to id disk dev mapping

Browse source
This commit is contained in:
Tristan D. 2023-11-04 00:38:54 +01:00
parent f355381d2b
commit c322eef078
Signed by: tristan
SSH key fingerprint: SHA256:3RU4RLOoM8oAjFU19f1W6t8uouZbA7GWkaSW6rjp1k8
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
systems/nixos-desk/default.nix
View file

@ -28,7 +28,7 @@
}; };
initrd = { initrd = {
availableKernelModules = [ "amdgpu" "nvme" "xhci_pci" "uas" "usbhid" "usb_storage" "sd_mod" ]; availableKernelModules = [ "amdgpu" "ahci" "nvme" "xhci_pci" "uas" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ]; kernelModules = [ ];
systemd.enable = true; systemd.enable = true;
}; };

36
systems/nixos-desk/disko.nix
View file

@ -3,14 +3,14 @@
disk = { disk = {
cryptboot_1 = { cryptboot_1 = {
type = "disk"; type = "disk";
device = "/dev/disk/by-path/pci-0000:08:00.0-nvme-1"; device = "/dev/disk/by-id/nvme-CT1000P1SSD8_2003E28202D0";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
luks = { luks = {
# size = "831.5G"; # size = "831.5G";
end = "-100G"; end = "-100G";
label = "Linux LUKS"; # label = "Linux LUKS";
type = "8309"; type = "8309";
content = { content = {
type = "luks"; type = "luks";
@ -22,32 +22,32 @@
}; };
}; };
luksSwap = { luksSwap = {
# TODO Create
size = "32G"; size = "32G";
content = { # TODO Create
type = "luks"; # content = {
name = "cryptswap_0"; # type = "luks";
extraOpenArgs = [ "--allow-discards" ]; # name = "cryptswap_0";
passwordFile = "/tmp/secret.key"; # extraOpenArgs = [ "--allow-discards" ];
additionalKeyFiles = [ ]; # passwordFile = "/tmp/secret.key";
content = { # additionalKeyFiles = [ ];
type = "swap"; # content = {
}; # type = "swap";
}; # };
# };
}; };
}; };
}; };
}; };
cryptboot_0 = { cryptboot_0 = {
type = "disk"; type = "disk";
device = "/dev/disk/by-path/pci-0000:03:00.0-nvme-1"; device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S4EWNX0NB42209Z";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
luks = { luks = {
# size = "831.5G"; # size = "831.5G";
end = "-100G"; end = "-100G";
label = "Linux LUKS"; # label = "Linux LUKS";
type = "8309"; type = "8309";
content = { content = {
type = "luks"; type = "luks";
@ -122,7 +122,7 @@
}; };
}; };
ESP = { ESP = {
label = "EFI system partition"; label = "EFI_0";
name = "ESP"; name = "ESP";
size = "1024M"; size = "1024M";
type = "EF00"; type = "EF00";
@ -148,14 +148,14 @@
}; };
sandisk = { sandisk = {
type = "disk"; type = "disk";
device = "/dev/disk/by-path/pci-0000:06:00.0-ata-4"; device = "/dev/disk/by-id/ata-SanDisk_SDSSDH3_4T00_211011800267";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
luks = { luks = {
# ~size = "3.4T"; # ~size = "3.4T";
end = "-250G"; end = "-250G";
label = "Linux filesystem"; label = "SanDisk";
type = "8300"; type = "8300";
content = { content = {
type = "btrfs"; type = "btrfs";