From b997cb6bf584aea806d6f0fde38232833ab3b73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <raphael@numbus.eu>
Date: Fri, 2 Jan 2026 20:04:59 +0100
Subject: [PATCH] Removed boot initrd options

---
 deploy.sh                               | 26 +++----------------------
 templates/nix-config/disks/snapraid.nix |  1 -
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 634e03a..d16b907 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -492,21 +492,12 @@ EOF
     cp -avu templates/nix-config/disks/snapraid.nix final-nix-config/etc/nixos/disks/
     cp -avu templates/nix-config/disks/pcr-check.nix final-nix-config/etc/nixos/disks/
     sed -i "s|#    ./disks/snapraid.nix|    ./disks/snapraid.nix|" final-nix-config/etc/nixos/configuration.nix
-    sed -i '$ d' final-nix-config/etc/nixos/disks/snapraid.nix
-    cat << EOF >> final-nix-config/etc/nixos/disks/snapraid.nix
-  # --> Automatic data disks unlock, generated by deploy.sh on $(date)
-  boot.initrd.luks.devices = {
 EOF
     j=0
     for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do
       export j=$((j + 1))
       export CONTENT_DISK_ID="${DATA_DISKS_ID[${i}]}"
       (envsubst < "templates/nix-config/disks/content.nix") >> final-nix-config/etc/nixos/disks/disko.nix
-      cat << EOF >> final-nix-config/etc/nixos/disks/snapraid.nix
-    "crypted-content-disk-${j}" = {
-      device = "${CONTENT_DISK_ID}";
-      keyFile = "/etc/secrets/disks/content-disk-${j}";
-    };
 EOF
     done
     echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)."
@@ -515,20 +506,9 @@ EOF
       export j=$((j + 1))
       export PARITY_DISK_ID="${DATA_DISKS_ID[${i}]}"
       (envsubst < "templates/nix-config/disks/parity.nix") >> final-nix-config/etc/nixos/disks/disko.nix
-      cat << EOF >> final-nix-config/etc/nixos/disks/snapraid.nix
-    "crypted-parity-disk-${j}" = {
-      device = "${PARITY_DISK_ID}";
-      keyFile = "/etc/secrets/disks/parity-disk-${j}}";
-    };
 EOF
     done
     echo -e "\n✅ Generated $PARITY_DISK_NUMBER parity disk configuration(s)."
-    # Close the snapraid.nix block
-    cat <<'EOF' >> final-nix-config/etc/nixos/disks/snapraid.nix
-  # Automatic data disks unlock <--
-  };
-}
-EOF
   fi
   # Close the disko.nix block
   cat <<'EOF' >> final-nix-config/etc/nixos/disks/disko.nix
@@ -564,7 +544,7 @@ EOF
     chmod 600 "final-nix-config/etc/secrets/disks/boot-disk-${i}"
     ssh_to_host 'bash -s' << EOF
 echo "$REMOTE_PASS" | sudo -S mkdir -p /etc/secrets/disks/
-echo "$REMOTE_PASS" | sudo -S bash -c "printf '%s' '$PASS' > /etc/secrets/disks/boot-disk-${i}"
+echo "$REMOTE_PASS" | sudo -S bash -c "echo '$PASS' > /etc/secrets/disks/boot-disk-${i}"
 EOF
   done
   for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do
@@ -572,7 +552,7 @@ EOF
     echo -n "$PASS" > "final-nix-config/etc/secrets/disks/content-disk-${i}"
     chmod 600 "final-nix-config/etc/secrets/disks/content-disk-${i}"
     ssh_to_host 'bash -s' << EOF
-echo "$REMOTE_PASS" | sudo -S bash -c "printf '%s' '$PASS' > /etc/secrets/disks/content-disk-${i}"
+echo "$REMOTE_PASS" | sudo -S bash -c "echo '$PASS' > /etc/secrets/disks/content-disk-${i}"
 EOF
   done
   for i in $(seq 1 "$PARITY_DISK_NUMBER"); do
@@ -580,7 +560,7 @@ EOF
     echo -n "$PASS" > "final-nix-config/etc/secrets/disks/parity-disk-${i}"
     chmod 600 "final-nix-config/etc/secrets/disks/parity-disk-${i}"
       ssh_to_host 'bash -s' << EOF
-echo "$REMOTE_PASS" | sudo -S bash -c "printf '%s' '$PASS' > /etc/secrets/disks/parity-disk-${i}"
+echo "$REMOTE_PASS" | sudo -S bash -c "echo '$PASS' > /etc/secrets/disks/parity-disk-${i}"
 EOF
   done
 
diff --git a/templates/nix-config/disks/snapraid.nix b/templates/nix-config/disks/snapraid.nix
index d868236..2ea0587 100644
--- a/templates/nix-config/disks/snapraid.nix
+++ b/templates/nix-config/disks/snapraid.nix
@@ -40,5 +40,4 @@ in
     dataDisks = builtins.removeAttrs snapraidDataDisks [ "i" ];
   };
 ### SnapRAID setup <--
-
 }
\ No newline at end of file