fix: boot usb setting

misumisumi · May 12, 2024 · c27e9c1 · c27e9c1
1 parent 2b6e9c7
commit c27e9c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/machines/recovery/filesystem.nix b/machines/recovery/filesystem.nix
@@ -23,30 +23,27 @@ in
                 ];
               };
             };
-            lvm-recovery = {
+            recovery = {
               size = "100%";
               type = "8E00";
               content = {
                 type = "lvm_pv";
-                vg = "lvm-recovery";
+                vg = "BootUSB";
               };
             };
-            luks-recovery = {
+            luks = {
               size = "32G";
               content = {
                 type = "luks";
-                name = "crypted-recovery";
-                extraOpenArgs = [ ];
+                name = "luks-bootusb";
+                initrdUnlock = false; # Do not unlock on boot
+                passwordFile = "/tmp/secrets/luks.key";
                 settings = {
-                  # if you want to use the key for interactive login be sure there is no trailing newline
-                  # for example use `echo -n "password" > /tmp/secret.key`
-                  keyFile = "/tmp/secrets/luks.key";
                   allowDiscards = true;
                 };
-                # additionalKeyFiles = [ "/tmp/secrets/additionalSecret.key" ];
                 content = {
                   type = "lvm_pv";
-                  vg = "secrets-recovery";
+                  vg = "SecretUSB";
                 };
               };
             };
@@ -55,7 +52,7 @@ in
       };
     };
     lvm_vg = {
-      lvm-recovery = {
+      BootUSB = {
         type = "lvm_vg";
         lvs = {
           root = {
@@ -87,7 +84,7 @@ in
           };
         };
       };
-      secrets-recovery = {
+      SecretUSB = {
         type = "lvm_vg";
         lvs = {
           secrets = {

diff --git a/machines/recovery/hardware-configuration.nix b/machines/recovery/hardware-configuration.nix
@@ -8,7 +8,6 @@
 , ...
 }: {
   imports = [
-    (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
   boot = {