From d9c9ecad3978ba3ac43ae2816c31999ef4f80aaf Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sun, 29 Sep 2024 16:59:48 +0800
Subject: [PATCH] modules.system.fileSystems.luks: fix manula decryption

---
 modules/system/fileSystems/luks/default.nix | 23 +++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/system/fileSystems/luks/default.nix b/modules/system/fileSystems/luks/default.nix
index 8826ef84..a319e668 100644
--- a/modules/system/fileSystems/luks/default.nix
+++ b/modules/system/fileSystems/luks/default.nix
@@ -61,20 +61,21 @@ inputs:
       boot.initrd =
       {
         luks.forceLuksSupportInInitrd = true;
-        systemd.services.wait-manual-decrypt =
+        systemd =
         {
-          wantedBy = [ "initrd-root-fs.target" ];
-          before = [ "roll-rootfs.service" ];
-          unitConfig.DefaultDependencies = false;
-          serviceConfig.Type = "oneshot";
-          script = builtins.concatStringsSep "\n" (builtins.map
-            (device: "while [ ! -e /dev/mapper/${device.value.mapper} ]; do sleep 1; done")
-            (inputs.localLib.attrsToList luks.manual.devices));
+          services.wait-manual-decrypt =
+          {
+            wantedBy = [ "initrd-root-fs.target" ];
+            before = [ "roll-rootfs.service" ];
+            unitConfig.DefaultDependencies = false;
+            serviceConfig.Type = "oneshot";
+            script = builtins.concatStringsSep "\n" (builtins.map
+              (device: "while [ ! -e /dev/mapper/${device.value.mapper} ]; do sleep 1; done")
+              (inputs.localLib.attrsToList luks.manual.devices));
+          };
+          extraBin.cryptsetup = "${inputs.pkgs.cryptsetup}/bin/cryptsetup";
         };
       };
-      fileSystems = builtins.listToAttrs (builtins.map
-        (mount: { name = mount; value.options = [ "x-systemd.device-timeout=48h" ]; })
-        luks.manual.delayedMount);
     })
   ];
 }