diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix index b30b1e1..e951184 100644 --- a/systems/jeeves/hardware.nix +++ b/systems/jeeves/hardware.nix @@ -11,10 +11,13 @@ let keyFile = "/dev/disk/by-id/usb-XIAO_USB_Drive_24587CE29074-0:0"; fallbackToPassword = true; }; - makeLuksSSD = device: (makeLuksDevice device) // { - bypassWorkqueues = true; - allowDiscards = true; - }; + makeLuksSSD = + device: + (makeLuksDevice device) + // { + bypassWorkqueues = true; + allowDiscards = true; + }; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -53,31 +56,51 @@ in luks.devices = { # cspell:disable # Root pool - "luks-root-pool-wwn-0x55cd2e4150f01519-part2" = makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2"; - "luks-root-pool-wwn-0x55cd2e4150f01556-part2" = makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part2"; - + "luks-root-pool-wwn-0x55cd2e4150f01519-part2" = + makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2"; + "luks-root-pool-wwn-0x55cd2e4150f01556-part2" = + makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part2"; + # Media pool - "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1" = makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1"; - "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1" = makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1"; - "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1" = makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1"; - "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1" = makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1"; + "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1"; + "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1"; + "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1"; + "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1"; # Scratch pool - "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01C-part1" = makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01C-part1"; - "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01E-part1" = makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01E-part1"; + "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01C-part1" = + makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01C-part1"; + "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01E-part1" = + makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01E-part1"; # Storage pool - "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1" = makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1"; - "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1" = makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1"; - "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1" = makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1"; - "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1" = makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1"; - "luks-storage_pool-wwn-0x5000cca23bc438dd-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bc438dd-part1"; - "luks-storage_pool-wwn-0x5000cca23bd035f5-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd035f5-part1"; - "luks-storage_pool-wwn-0x5000cca23bd00ad6-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-part1"; - "luks-storage_pool-wwn-0x5000cca23bcf313e-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bcf313e-part1"; - "luks-storage_pool-wwn-0x5000cca23bcdf3b8-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bcdf3b8-part1"; - "luks-storage_pool-wwn-0x5000cca23bd02746-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd02746-part1"; - "luks-storage_pool-wwn-0x5000cca23bcf9f89-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bcf9f89-part1"; - "luks-storage_pool-wwn-0x5000cca23bd00ae9-part1" = makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd00ae9-part1"; + "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1"; + "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1"; + "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1"; + "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1" = + makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1"; + "luks-storage_pool-wwn-0x5000cca23bc438dd-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bc438dd-part1"; + "luks-storage_pool-wwn-0x5000cca23bd035f5-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd035f5-part1"; + "luks-storage_pool-wwn-0x5000cca23bd00ad6-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-part1"; + "luks-storage_pool-wwn-0x5000cca23bcf313e-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bcf313e-part1"; + "luks-storage_pool-wwn-0x5000cca23bcdf3b8-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bcdf3b8-part1"; + "luks-storage_pool-wwn-0x5000cca23bd02746-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd02746-part1"; + "luks-storage_pool-wwn-0x5000cca23bcf9f89-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bcf9f89-part1"; + "luks-storage_pool-wwn-0x5000cca23bd00ae9-part1" = + makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd00ae9-part1"; }; };