Misc changes.

deploy.sh

@@ -251,7 +251,7 @@ services_selection() {
   local AVAILABLE_SERVICES=( "frigate" "gitea" "home-assistant" "immich" "it-tools" \
   "nextcloud" "passbolt" "pi-hole" "virtualization" )
 
-  local SERVICES_DESCRIPTION=( "Pi-Hole : Block ads on all your devices" \
+  local SERVICES_DESCRIPTION=( "Pi-Hole [Always included] : Block ads on all your devices" \
   "Immich : Pictures and videos backup with local machine-learning" \
   "Nextcloud : No fuss Office 365 replacement" \
   "Passbolt: Security-first password manager with collaboration features" \
@@ -443,7 +443,10 @@ services_generation() {
   echo -e "\n ✅ Writing configuration files for the selected homelab services..."
   cp -${FILES_COPY_FLAGS} templates/nix-config/configuration.nix final-nix-config/etc/nixos/configuration.nix
   cp -${FILES_COPY_FLAGS} templates/nix-config/podman/traefik.nix final-nix-config/etc/nixos/podman/traefik.nix
+  cp -${FILES_COPY_FLAGS} templates/nix-config/podman/pi-hole.nix final-nix-config/etc/nixos/podman/pi-hole.nix
   envsubst < templates/podman-config/traefik/traefik.yaml > final-nix-config/mnt/config/traefik/traefik.yaml
+  generate_network "${service}" "0"
+  export FTLCONF_WEBSERVER_PASSWORD="$(xkcdpass -d "-")"
 
   for service in "${SELECTED_SERVICES[@]}"; do
     # Copy podman container file
@@ -511,11 +514,6 @@ services_generation() {
       envsubst < templates/podman-config/traefik/headers.yaml > final-nix-config/mnt/config/traefik/rules/headers.yaml
       envsubst < templates/podman-config/traefik/tls.yaml > final-nix-config/mnt/config/traefik/rules/tls.yaml
 
-    # Pi-Hole config
-    elif [[ "${service}" == "pi-hole" ]]; then
-      generate_network "${service}" "0"
-      export FTLCONF_WEBSERVER_PASSWORD="$(xkcdpass -d "-")"
-
     # Virtualization config
     elif [[ "${service}" == "virtualization" ]]; then
       sed -i "s|#  virtualisation.libvirtd.enable = true;|  virtualisation.libvirtd.enable = true;|" final-nix-config/etc/nixos/configuration.nix