Fix flake.nix indentation.

deploy.sh

@@ -149,12 +149,17 @@ ssh_to_host() {
 }
 
 hierarchy_preparation() {
+  mkdir -p final-nix-config/etc/numbus-server
   mkdir -p final-nix-config/etc/secrets
   mkdir -p final-nix-config/etc/secrets/disks
   mkdir -p final-nix-config/etc/nixos/secrets
+  mkdir -p final-nix-config/var
+  mkdir -p final-nix-config/var/lib
+  mkdir -p final-nix-config/var/lib/sops-nix
 
   echo -e "\n✅ Writing configuration..."
   cp -${FILES_COPY_FLAGS} templates/nix-config/configuration.nix final-nix-config/etc/nixos/configuration.nix
+  cp -${FILES_COPY_FLAGS} templates/nix-config/flake.nix final-nix-config/etc/nixos/flake.nix
   export CONFIGURATION_PATH="final-nix-config/etc/nixos/configuration.nix"
 }
 
@@ -376,6 +381,7 @@ disks_selection() {
   fi
 
   export SPINDOWN_DISKS_ID
+  export BOOT_DISKS_ID_LIST
   export PARITY_DISK_NUMBER_LIST
   export CONTENT_DISK_NUMBER_LIST
 }
@@ -559,15 +565,10 @@ cloudflare_dns_setup() {
 
   SELECTED_SERVICES_DNS=()
   for service in "${SELECTED_SERVICES[@]}"; do
-    if [[ "${service}" == "nextcloud" ]]; then
-      SELECTED_SERVICES_DNS+=("nextcloud.${DOMAIN_NAME}" "nextcloud-aio.${DOMAIN_NAME}")
-    elif [[ "${service}" == "virtualization" ]]; then
-      :
-    else
+    [[ "${service}" == "virtualization" ]] && continue
     SELECTED_SERVICES_DNS+=("${service}.${DOMAIN_NAME}")
-    fi
   done
-  SELECTED_SERVICES_DNS+=("traefik.${DOMAIN_NAME}")
+  SELECTED_SERVICES_DNS+=("${SELECTED_DNS_SERVICE}.${DOMAIN_NAME}")
 
   # Get Zone ID
   ZONE_ID=$(curl -s -X GET "https://api.cloudflare.com/client/v4/zones?name=${DOMAIN_NAME}" \
@@ -609,8 +610,6 @@ export_configuration() {
   local CONFIG_EXPORT_DIR="final-nix-config/etc/numbus-server/"
   local CONFIG_EXPORT_FILE="${CONFIG_EXPORT_DIR}/numbus-server.conf"
 
-  cp -${FILES_COPY_FLAGS} templates/post-install/numbus-server.sh "$CONFIG_EXPORT_DIR"
-
   echo "export TARGET_INTERFACE=\"${TARGET_INTERFACE}\""              >> $CONFIG_EXPORT_FILE
   echo -e "\n# SERVER SETTINGS"                                       >> $CONFIG_EXPORT_FILE
   echo "export SERVER_OWNER_NAME=\"${SERVER_OWNER_NAME:-User}\""      >> $CONFIG_EXPORT_FILE
@@ -624,11 +623,6 @@ export_configuration() {
   echo -e "\n# TPM SETTINGS"                                          >> $CONFIG_EXPORT_FILE
   echo "export TARGET_TPM=\"${TARGET_TPM}\""                          >> $CONFIG_EXPORT_FILE
   echo "export TARGET_TPM_VERSION=\"${TARGET_TPM_VERSION:-}\""        >> $CONFIG_EXPORT_FILE
-  echo -e "\n# Podman SETTINGS"                                       >> $CONFIG_EXPORT_FILE
-  echo "export PODMAN_NETWORKS=\"${PODMAN_NETWORKS}\""                >> $CONFIG_EXPORT_FILE
-  echo "export TRAEFIK_NETWORKS=\"${TRAEFIK_NETWORKS}\""              >> $CONFIG_EXPORT_FILE
-  echo "export TRAEFIK_REF_NETWORKS=\"${TRAEFIK_REF_NETWORKS}\""      >> $CONFIG_EXPORT_FILE
-  echo "export SERVICES_NETWORK_IDS=\"(${SERVICES_NETWORK_IDS[@]})\"" >> $CONFIG_EXPORT_FILE
 }
 
 deploy() {

templates/nix-config/flake.nix

@@ -23,6 +23,8 @@
       inherit system;
       config.allowUnfree = true;
     };
+  in 
+  {
     nixosConfigurations = {
       numbus-server = nixpkgs.lib.nixosSystem {
         inherit system;
@@ -39,7 +41,7 @@
           # Core host configuration
           ./configuration.nix
           ./hardware-configuration.nix
-        ]
+        ];
       };
     };
   };