Skip backup questions if specified

flake.nix

@@ -45,6 +45,7 @@
     valhalla = {
       DerGeret = import ./profiles/machines/manuel/DerGeret/Arch/config.nix;
       ManuSurface = import ./profiles/machines/manuel/ManuSurface/Arch/config.nix;
+      server = import ./profiles/machines/manuel/server.nix;
     };
   };
 }

profiles/machines/manuel/server.nix

@@ -0,0 +1,72 @@
+{ lib, config, ... }:
+let fs = import ../../../lib/modules/partition/fs.nix;
+in {
+  imports = [ ./defaults.nix ];
+
+  config = {
+    valhalla = {
+      partition = {
+        os = {
+          partitions = {
+            Boot = {
+              index = 1;
+              type = "uefi";
+              size = "+1G";
+              format = fs.fat32;
+              mountPoint = config.valhalla.boot.efiMountPoint;
+            };
+
+            Swap = {
+              index = 2;
+              type = "swap";
+            };
+
+            OS = {
+              index = 3;
+              label = lib.mkDefault config.valhalla.boot.label;
+              type = "linux";
+              format = fs.ext4;
+              mountPoint = "/";
+            };
+          };
+        };
+      };
+
+      hostname = "nuth.ch";
+      timeZone = "Europe/Zurich";
+      keyMap = "de_CH-latin1";
+      keyboardLayout = "ch";
+
+      i18n = {
+        localeSettings = let defaultLocale = "en_US.UTF-8";
+        in {
+          LANG = "de_CH.UTF-8";
+          LANGUAGE = defaultLocale;
+          LC_MESSAGE = defaultLocale;
+        };
+      };
+
+      software = {
+        essential = true;
+        server = true;
+      };
+
+      programs.docker.enable = true;
+
+      linux.programs = {
+        docker = {
+          services = {
+            drone.enable = true;
+            forgejo.enable = true;
+            minecraft.enable = true;
+            nextcloud.enable = true;
+            teamspeak.enable = true;
+            trackmania.enable = true;
+            vaultwarden.enable = true;
+            woodpecker.enable = true;
+          };
+        };
+      };
+    };
+  };
+}

scripts/Common/OS/backup.fish

@@ -14,31 +14,33 @@ function backupAction -V dir
 
     set -l deployScript (getDeploymentScript)
 
-    if fish "$dir/../../../lib/modules/partition/confirm.fish" "Do you wish to store the backup on an SSH server?" n
+    if [ -z "$VALHALLA_BACKUP_DIR" ]
-        read -xP "Please specify the host name of the SSH server: " VALHALLA_BACKUP_SERVER
+        if fish "$dir/../../../lib/modules/partition/confirm.fish" "Do you wish to store the backup on an SSH server?" n
-        read -xP "Please specify the port of the SSH server (default 22): " VALHALLA_BACKUP_SERVER_PORT
+            read -xP "Please specify the host name of the SSH server: " VALHALLA_BACKUP_SERVER
-        read -xP "Please specify the name of the user to log in to the SSH server: " VALHALLA_BACKUP_SERVER_USER
+            read -xP "Please specify the port of the SSH server (default 22): " VALHALLA_BACKUP_SERVER_PORT
-
+            read -xP "Please specify the name of the user to log in to the SSH server: " VALHALLA_BACKUP_SERVER_USER
-        if [ -z "$VALHALLA_BACKUP_SERVER_PORT" ]
+    
-            set -x VALHALLA_BACKUP_SERVER_PORT 22
+            if [ -z "$VALHALLA_BACKUP_SERVER_PORT" ]
+                set -x VALHALLA_BACKUP_SERVER_PORT 22
+            end
+    
+            if [ -n "$VALHALLA_BACKUP_USER" ]
+                set -x VALHALLA_BACKUP_SERVER "$VALHALLA_BACKUP_SERVER_USER@$VALHALLA_BACKUP_SERVER"
+            end
+    
+            echo
+            echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"
+            echo "For a seamless experience, please make sure that you are able to establish an unattended ssh connection using key authentication."
+            echo
+            echo "$(tput bold)This command should succeed without user interaction:$(tput sgr0)"
+            echo "ssh -o PasswordAuthentication=no -p $VALHALLA_BACKUP_SERVER_PORT $VALHALLA_BACKUP_SERVER true"
+            read -P "Press enter once you're done: "
+            echo
         end
 
-        if [ -n "$VALHALLA_BACKUP_USER" ]
+        read -xP "Please specify the path to the directory to save the backup to: " VALHALLA_BACKUP_DIR
-            set -x VALHALLA_BACKUP_SERVER "$VALHALLA_BACKUP_SERVER_USER@$VALHALLA_BACKUP_SERVER"
-        end
-
-        echo
-        echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"
-        echo "For a seamless experience, please make sure that you are able to establish an unattended ssh connection using key authentication."
-        echo
-        echo "$(tput bold)This command should succeed without user interaction:$(tput sgr0)"
-        echo "ssh -o PasswordAuthentication=no -p $VALHALLA_BACKUP_SERVER_PORT $VALHALLA_BACKUP_SERVER true"
-        read -P "Press enter once you're done: "
-        echo
     end
 
-    read -xP "Please specify the path to the directory to save the backup to: " VALHALLA_BACKUP_DIR
-
     runHook backupSoftware || begin
         echo "Backing up software..."
 

scripts/Common/Software/docker/services/service.fish

@@ -173,6 +173,6 @@ begin
     end
 
     function getBackupArgs
-        printf "%s\n" --hidden --no-ignore . --exclude "docker-compose"{,.base}".yml" (getServiceRoot $argv)
+        printf "%s\n" --base-directory (getServiceRoot $argv) --hidden --no-ignore "^(docker-compose\.secrets\.yml|data)\$"
     end
 end