From bfcc13df90fdf78e56ea998959d0afd08d2ba724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <raphael@numbus.eu>
Date: Fri, 2 Jan 2026 19:08:21 +0100
Subject: [PATCH] Removed unnecessary logic

---
 deploy.conf |  7 +++++--
 deploy.sh   | 45 ++++++++++++++++++++-------------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/deploy.conf b/deploy.conf
index 664d0fc..b4fb812 100644
--- a/deploy.conf
+++ b/deploy.conf
@@ -5,7 +5,7 @@ SSH_PUBLIC_KEY="ssh-ed25519 AAAAoefzefpoipoeCEZJCPEACPAcjapjcpajepcjAPJECJPEJAPJ
 DOMAIN_NAME="yourdomain.com"
 EMAIL_ADDRESS="your-mail@yourdomain.com"
 CF_DNS_API_TOKEN="yourToken"
-#SMTP SETTINGS
+# SMTP SETTINGS
 SENDER_EMAIL_ADDRESS="youraddress@gmail.com"
 SENDER_EMAIL_ADDRESS_PASSWORD="emrp raps vzoi vnoe"
 SENDER_EMAIL_DOMAIN="smtp.yourdomain.com"
@@ -13,4 +13,7 @@ SENDER_EMAIL_PORT="587"
 #NETWORK SETTINGS
 HOME_ROUTER_SUBNET="192.168.1.0/24"
 HOME_ROUTER_IP="192.168.1.1"
-HOME_SERVER_IP="192.168.1.5"
\ No newline at end of file
+HOME_SERVER_IP="192.168.1.5"
+# SERVICES SETTINGS
+SELECTED_SERVICES=( "frigate" "gitea" "home-assistant" "immich" "it-tools" \
+"nextcloud" "passbolt" "pi-hole" )
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index 3b78541..f9189cf 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -222,11 +222,6 @@ services_selection() {
       SELECTED_SERVICES+=(${AVAILABLE_SERVICES[$i]})
     fi
   done
-
-  for service in ${SELECTED_SERVICES[@]}; do
-    mkdir -p final-nix-config/mnt/config/"${service}"
-    mkdir -p final-nix-config/mnt/data/"${service}"
-  done
 }
 
 files_generation() {
@@ -567,26 +562,23 @@ 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}"
 EOF
   done
-  if [[ "$CONTENT_DISK_NUMBER" -gt 0 ]]; then
-    for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do
-      PASS="$(xkcdpass -d "-")"
-      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
+  for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do
+    PASS="$(xkcdpass -d "-")"
+    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}"
 EOF
-    done
-  fi
-  if [[ "$PARITY_DISK_NUMBER" -gt 0 ]]; then
-    for i in $(seq 1 "$PARITY_DISK_NUMBER"); do
-      PASS="$(xkcdpass -d "-")"
-      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
+  done
+  for i in $(seq 1 "$PARITY_DISK_NUMBER"); do
+    PASS="$(xkcdpass -d "-")"
+    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}"
 EOF
-    done
-  fi
+  done
+
 ### Generate unlock keys <--
 }
 
@@ -631,9 +623,9 @@ echo "* **Gitea DB User:** \`${GITEA_DB_USERNAME}\`" && echo "* **Gitea DB Passw
 || echo "* **Gitea:** *Not configured*" )
 
 **Disk Encryption Keys:**
-$(for i in $(seq 1 "${#BOOT_DISKS_ID[@]}"); do f="final-nix-config/etc/secrets/disks/boot-disk-${i}"; [[ -f "$f" ]] && echo "* **Boot Disk $i Key:** \`$(cat "$f")\`"; done)
-$(if [[ "$CONTENT_DISK_NUMBER" -gt 0 ]]; then for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do f="final-nix-config/etc/secrets/disks/content-disk-${i}"; [[ -f "$f" ]] && echo "* **Content Disk $i Key:** \`$(cat "$f")\`"; done; fi)
-$(if [[ "$PARITY_DISK_NUMBER" -gt 0 ]]; then for i in $(seq 1 "$PARITY_DISK_NUMBER"); do f="final-nix-config/etc/secrets/disks/parity-disk-${i}"; [[ -f "$f" ]] && echo "* **Parity Disk $i Key:** \`$(cat "$f")\`"; done; fi)
+$( for i in $(seq 1 "${#BOOT_DISKS_ID[@]}"); do f="final-nix-config/etc/secrets/disks/boot-disk-${i}"; [[ -f "$f" ]] && echo "* **Boot Disk $i Key:** \`$(cat "$f")\`"; done )
+$( for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do f="final-nix-config/etc/secrets/disks/content-disk-${i}"; [[ -f "$f" ]] && echo "* **Content Disk $i Key:** \`$(cat "$f")\`"; done; fi )
+$( for i in $(seq 1 "$PARITY_DISK_NUMBER"); do f="final-nix-config/etc/secrets/disks/parity-disk-${i}"; [[ -f "$f" ]] && echo "* **Parity Disk $i Key:** \`$(cat "$f")\`"; done; fi )
 EOF
 )
 
@@ -773,6 +765,10 @@ if [[ "$ACTION_ANSWER" == "[1] 🌐 Deploy NixOS on a remote machine" ]]; then
   setup_ssh
   hardware_detection
   services_selection
+  for service in ${SELECTED_SERVICES[@]}; do
+    mkdir -p final-nix-config/mnt/config/"${service}"
+    mkdir -p final-nix-config/mnt/data/"${service}"
+  done
   files_generation
   disk_config_generation
   export_configuration
@@ -791,7 +787,6 @@ elif [[ "$ACTION_ANSWER" == "[2] 💽 Deploy NixOS on a remote machine with a fi
   generate_folder_tree
   setup_ssh
   hardware_detection
-  services_selection
   files_generation
   disk_config_generation
   export_configuration