diff options
Diffstat (limited to 'machines/aszlig/managed')
-rw-r--r-- | machines/aszlig/managed/shakti.nix | 17 | ||||
-rw-r--r-- | machines/aszlig/managed/tyree.nix | 16 |
2 files changed, 17 insertions, 16 deletions
diff --git a/machines/aszlig/managed/shakti.nix b/machines/aszlig/managed/shakti.nix index 8440ce6f..e916914c 100644 --- a/machines/aszlig/managed/shakti.nix +++ b/machines/aszlig/managed/shakti.nix @@ -3,19 +3,20 @@ { boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.luks.devices = [ - { name = "00vault"; + boot.initrd.luks.devices = { + "00vault" = { device = "/dev/disk/by-uuid/a70f4ff8-e463-42fa-8148-6783dd352f96"; - } - { name = "shakti-swap"; + }; + shakti-swap = { device = "/dev/disk/by-uuid/69f3a774-c796-4dbd-a38b-32f019d05e7c"; keyFile = "/dev/mapper/00vault"; - } - { name = "shakti-root"; + }; + shakti-root = { device = "/dev/disk/by-uuid/8a67bdf9-08bb-4214-b728-88cf1c2ee206"; keyFile = "/dev/mapper/00vault"; - } - ]; + }; + }; + boot.initrd.postDeviceCommands = lib.mkAfter '' cryptsetup luksClose /dev/mapper/00vault ''; diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix index 2f2c410d..c7190507 100644 --- a/machines/aszlig/managed/tyree.nix +++ b/machines/aszlig/managed/tyree.nix @@ -4,19 +4,19 @@ boot.initrd.availableKernelModules = [ "usbhid" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.initrd.luks.devices = [ - { name = "00-vault"; + boot.initrd.luks.devices = { + "00-vault" = { device = "/dev/disk/by-uuid/e4eb3d30-7fa5-4af4-86fb-80b47518cc25"; - } - { name = "tyree-swap"; + }; + tyree-swap = { device = "/dev/disk/by-uuid/d96e29b4-0b9a-442d-af27-805f69ffffb3"; keyFile = "/dev/mapper/00-vault"; - } - { name = "tyree-root"; + }; + tyree-root = { device = "/dev/disk/by-uuid/21e9a86e-c8dc-4d8f-ba75-d03552dc32f7"; keyFile = "/dev/mapper/00-vault"; - } - ]; + }; + }; boot.initrd.postDeviceCommands = lib.mkAfter '' cryptsetup luksClose /dev/mapper/00-vault |