From 49e5df9a9f3fc7ce33de543fda0e61899296d3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <raphael@numbus.eu>
Date: Fri, 2 Jan 2026 22:56:52 +0100
Subject: [PATCH] Added vars to snapraid.nix

---
 deploy.sh                               | 15 +++------------
 templates/nix-config/disks/snapraid.nix |  8 ++++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 3507438..5dc8794 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -510,11 +510,6 @@ EOF
     # Enable SnapRAID
     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
-
-    MERGERFS_MOUNTS=""
-    SNAPRAID_CONTENT_FILES=""
-    SNAPRAID_DATA_DISKS=""
-
     j=0
     for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do
       export j=$((j + 1))
@@ -526,12 +521,6 @@ EOF
       SNAPRAID_DATA_DISKS+="      d${j} = \"/mnt/content-${j}\";"$'\n'
     done
     echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)."
-
-    export MERGERFS_MOUNTS=${MERGERFS_MOUNTS%:}
-    export SNAPRAID_CONTENT_FILES
-    export SNAPRAID_DATA_DISKS
-
-    SNAPRAID_PARITY_FILES=""
     j=0
     for i in $(seq $CONTENT_DISK_NUMBER $((${#DATA_DISKS_ID[@]} - 1))); do
       export j=$((j + 1))
@@ -541,7 +530,9 @@ EOF
       SNAPRAID_PARITY_FILES+="      \"/mnt/parity-${j}/snapraid.parity\""$'\n'
     done
     echo -e "\n✅ Generated $PARITY_DISK_NUMBER parity disk configuration(s)."
-
+    export MERGERFS_MOUNTS=${MERGERFS_MOUNTS%}
+    export SNAPRAID_CONTENT_FILES
+    export SNAPRAID_DATA_DISKS
     export SNAPRAID_PARITY_FILES
     envsubst < templates/nix-config/disks/snapraid.nix > final-nix-config/etc/nixos/disks/snapraid.nix
   fi
diff --git a/templates/nix-config/disks/snapraid.nix b/templates/nix-config/disks/snapraid.nix
index c39408c..3e177fa 100644
--- a/templates/nix-config/disks/snapraid.nix
+++ b/templates/nix-config/disks/snapraid.nix
@@ -12,7 +12,7 @@
       "cache.files=off"
       "moveonenospc=true"
       "category.create=mfs"
-      "srcmounts=MERGERFS_MOUNTS"
+      "srcmounts=$MERGERFS_MOUNTS"
     ];
   };
 ### MergerFS setup <--
@@ -21,13 +21,13 @@
   services.snapraid = {
     enable = true;
     contentFiles = [
-SNAPRAID_CONTENT_FILES
+$SNAPRAID_CONTENT_FILES
     ];
     parityFiles = [
-SNAPRAID_PARITY_FILES
+$SNAPRAID_PARITY_FILES
     ];
     dataDisks = {
-SNAPRAID_DATA_DISKS
+$SNAPRAID_DATA_DISKS
     };
   };
 ### SnapRAID setup <--