Back up teamspeak properly

archiso/airootfs/root/.zlogin

@@ -5,16 +5,17 @@ fi
 
 ~/.automated_script.sh
 
-if bash -c "ls /sys/class/backlight/*/max_brightness" >/dev/null 2>&1; then
+if bash -c "ls /sys/class/backlight/*/max_brightness" > /dev/null 2>&1
-    cat /sys/class/backlight/*/max_brightness >/sys/class/backlight/*/brightness
+then
+    cat /sys/class/backlight/*/max_brightness > /sys/class/backlight/*/brightness
 fi
 
 cd "/root/PortValhalla" || exit
 
-git diff -p -R --no-ext-diff --no-color --diff-filter=M |
+git diff -p -R --no-ext-diff --no-color --diff-filter=M \
-    grep -E "^(diff|(old|new) mode)" --color=never |
+    | grep -E "^(diff|(old|new) mode)" --color=never  \
-    sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" |
+    | sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" \
-    git apply
+    | git apply
 
 loadkeys de_CH-latin1
 ./scripts/Arch/OS/setup.fish

archiso/scripts/show-diff.fish

@@ -16,8 +16,9 @@ begin
         and begin
             git -C "$projectDir" ls-files
             git -C "$projectDir" ls-files --exclude-standard --others
-        end | rsync --files-from=/dev/stdin --exclude={.gitignore,README.md,scripts,LICENSE,valhalla.patch} "$dir/.." "$contextRoot"
+        end | \
-    end &>/dev/null
+            rsync --files-from=/dev/stdin --exclude={.gitignore,README.md,scripts,LICENSE,valhalla.patch} "$dir/.." "$contextRoot"
+    end &> /dev/null
 
     and git -C "$contextRoot" diff
 end

archiso/scripts/update-patch.fish

@@ -2,5 +2,5 @@
 # Updates the patch to be applicable to Arch's current `releng` template.
 begin
     set -l dir (status dirname)
-    "$dir/show-diff.fish" >"$dir/valhalla.patch"
+    "$dir/show-diff.fish" > "$dir/valhalla.patch"
 end

archiso/scripts/valhalla.patch

@@ -1,22 +1,23 @@
 diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
-index bf6bc8f..e71dc26 100644
+index bf6bc8f..bdbe55c 100644
 --- a/airootfs/root/.zlogin
 +++ b/airootfs/root/.zlogin
-@@ -4,3 +4,17 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
+@@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
  fi
  
  ~/.automated_script.sh
 +
-+if bash -c "ls /sys/class/backlight/*/max_brightness" >/dev/null 2>&1; then
++if bash -c "ls /sys/class/backlight/*/max_brightness" > /dev/null 2>&1
-+    cat /sys/class/backlight/*/max_brightness >/sys/class/backlight/*/brightness
++then
++    cat /sys/class/backlight/*/max_brightness > /sys/class/backlight/*/brightness
 +fi
 +
 +cd "/root/PortValhalla" || exit
 +
-+git diff -p -R --no-ext-diff --no-color --diff-filter=M |
++git diff -p -R --no-ext-diff --no-color --diff-filter=M \
-+    grep -E "^(diff|(old|new) mode)" --color=never |
++    | grep -E "^(diff|(old|new) mode)" --color=never  \
-+    sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" |
++    | sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" \
-+    git apply
++    | git apply
 +
 +loadkeys de_CH-latin1
 +./scripts/Arch/OS/setup.fish

lib/eval-attribute.nix

@@ -5,10 +5,8 @@ let
     overlay = [ ];
   };
   property = (builtins.getEnv "PROPERTY");
-  processor =
+  processor = if (builtins.stringLength property > 0) then
-    if (builtins.stringLength property > 0) then
+    (_: lib.attrsets.getAttrFromPath (lib.strings.splitString "." property) _)
-      (_: lib.attrsets.getAttrFromPath (lib.strings.splitString "." property) _)
+  else
-    else
+    (_: _);
-      (_: _);
+in _: processor (lib.evalModules { modules = [ _ ]; }).config
-in
-_: processor (lib.evalModules { modules = [ _ ]; }).config

lib/modules/hardware.nix

@@ -3,8 +3,7 @@ let
   inherit (lib) mkOption types;
   optionalAttrs = lib.attrsets.optionalAttrs;
   hw = config.valhalla.hardware;
-in
+in {
-{
   options = {
     valhalla = {
       hardware = {

lib/modules/os.nix

@@ -4,8 +4,7 @@ in {
   options = {
     valhalla = mkOption {
       type = types.submodule (
-        { extendModules, ... }:
+        { extendModules, ... }: let
-        let
           osVariant = extendModules {
             modules = [
               ({ config, ... }: {
@@ -36,8 +35,7 @@ in {
           };
 
           windowsVariant = osVariant.extendModules { };
-        in
+        in {
-        {
           options = {
             linux = mkOption {
               inherit (linuxVariant) type;
@@ -53,8 +51,7 @@ in {
               visible = "shallow";
             };
           };
-        }
+        });
-      );
 
       description = "Configuration for PortValhalla.";
       default = { };

lib/modules/partition/disks.nix

@@ -34,17 +34,15 @@ let
         };
 
         devicePath = mkOption {
-          type =
+          type = if osDisk then
-            if osDisk then
+            types.nullOr types.str
-              types.nullOr types.str
+          else
-            else
+            types.str;
-              types.str;
           description = "The path to the device.";
-          default =
+          default = if osDisk && config.deviceName == null then
-            if osDisk && config.deviceName == null then
+            null
-              null
+          else
-            else
+            "/dev/${config.deviceName}";
-              "/dev/${config.deviceName}";
         };
 
         deviceScript = mkOption {
@@ -71,146 +69,135 @@ let
         };
       };
 
-      config =
+      config = let
-        let
+        diskVarName = "${diskListVarName}[${config.id}]";
-          diskVarName = "${diskListVarName}[${config.id}]";
+        diskVar = "\${${diskVarName}}";
-          diskVar = "\${${diskVarName}}";
 
-          diskSelector = ''
+        diskSelector = ''
-            result="$(mktemp)"
+          result="$(mktemp)"
-            fish ${./choose-disk.fish} "$result" "Which disk do you wish to install the OS on?" ${./select.fish}
+          fish ${./choose-disk.fish} "$result" "Which disk do you wish to install the OS on?" ${./select.fish}
-            ${diskVarName}="$(cat "$result")"
+          ${diskVarName}="$(cat "$result")"
-          '';
+        '';
 
-          partitions = lib.lists.sortOn (_: _.index)
+        partitions = lib.lists.sortOn (_: _.index)
-            (builtins.filter (_: _ != null)
+          (builtins.filter (_: _ != null)
-              (builtins.attrValues config.partitions));
+            (builtins.attrValues config.partitions));
 
-          mkType = type:
+        mkType = type:
-            lib.strings.escapeShellArg (
+          lib.strings.escapeShellArg (
-              if builtins.isInt type then
+            if builtins.isInt type then
-                "${lib.trivial.toHexString type}"
+              "${lib.trivial.toHexString type}"
-              else
+            else
-                type
+              type);
-            );
 
-          fdiskCommand = arguments: "sudo sfdisk ${arguments}";
+        fdiskCommand = arguments: "sudo sfdisk ${arguments}";
-          fdiskScript = script: args: append:
+        fdiskScript = script: args: append:
-            "echo ${script} | ${
+          "echo ${script} | ${
             fdiskCommand "${builtins.concatStringsSep " " args} ${
               if append then "--append" else ""
             } ${diskVar}"
           }";
-          wipeScript = script: fdiskScript script [ ] false;
+        wipeScript = script: fdiskScript script [] false;
-          appendScript = index: script: fdiskScript script [ "-N" (builtins.toString index) ] true;
+        appendScript = index: script: fdiskScript script ["-N" (builtins.toString index)] true;
 
-          cleanup = lib.strings.concatLines (builtins.map
+        cleanup = lib.strings.concatLines (builtins.map
-            (partition: "${fdiskCommand "--delete ${diskVar} ${toString partition.index}"} || true")
+          (partition: "${fdiskCommand "--delete ${diskVar} ${toString partition.index}"} || true")
-            (lib.lists.sortOn
+          (lib.lists.sortOn
-              (partition: partition.index * -1)
+            (partition: partition.index * -1)
-              (builtins.filter (_: !_.keepExisting) partitions)));
+            (builtins.filter (_: !_.keepExisting) partitions)));
 
-          fdiskCommands = lib.strings.concatLines
+        fdiskCommands = lib.strings.concatLines
-            (lib.optionals config.wipe [
+          (lib.optionals config.wipe [
-              cleanup
+            cleanup
-              (wipeScript "label: gpt")
+            (wipeScript "label: gpt")
-            ] ++ (builtins.concatMap
+          ] ++ (builtins.concatMap (
-              (
+            partition:
-                partition:
+              let
-                let
+                inherit (partition) format index keepExisting label sizeScript type;
-                  inherit (partition) format index keepExisting label sizeScript type;
 
-                  partVarName = "myPartition";
+                partVarName = "myPartition";
-                  partVar = "\${${partVarName}}";
+                partVar = "\${${partVarName}}";
 
-                  sizeOption = ''
+                sizeOption = ''
-                    ${sizeScript} | sed -e "s/.*[^[:space:]]/size=\0/"
+                  ${sizeScript} | sed -e "s/.*[^[:space:]]/size=\0/"
-                  '';
+                '';
 
-                  formatScripts = {
+                formatScripts = {
-                    ${fs.ext4} = "mkfs.ext4 -F ${partVar}";
+                  ${fs.ext4} = "mkfs.ext4 -F ${partVar}";
-                    ${fs.swap} = "mkswap ${partVar}";
+                  ${fs.swap} = "mkswap ${partVar}";
-                    ${fs.ntfs} = "mkfs.ntfs -F ${partVar}";
+                  ${fs.ntfs} = "mkfs.ntfs -F ${partVar}";
-                    ${fs.fat32} = "mkfs.fat -F 32 ${partVar}";
+                  ${fs.fat32} = "mkfs.fat -F 32 ${partVar}";
-                  };
+                };
 
-                  labelScripts = {
+                labelScripts = {
-                    ${fs.ext4} = label: "e2label ${partVar} ${label}";
+                  ${fs.ext4} = label: "e2label ${partVar} ${label}";
-                    ${fs.swap} = label: "swaplabel ${partVar} --label ${label}";
+                  ${fs.swap} = label: "swaplabel ${partVar} --label ${label}";
-                    ${fs.ntfs} = label: "ntfslabel ${partVar} ${label}";
+                  ${fs.ntfs} = label: "ntfslabel ${partVar} ${label}";
-                    ${fs.fat32} = label: "fatlabel ${partVar} ${label}";
+                  ${fs.fat32} = label: "fatlabel ${partVar} ${label}";
-                  };
+                };
 
-                  create = lib.strings.concatLines [
+                create = lib.strings.concatLines [
-                    (appendScript index ''${toString index}: "$(${sizeOption})" type=${mkType type}'')
+                  (appendScript index ''${toString index}: "$(${sizeOption})" type=${mkType type}'')
-                    probeScript
+                  probeScript
-                    "sudo ${formatScripts.${format}}"
+                  "sudo ${formatScripts.${format}}"
-                  ];
+                ];
 
-                  fallback = ''
+                fallback = ''
-                    if ! { ls "${partVar}" 2>&1; } > /dev/null
+                  if ! { ls "${partVar}" 2>&1; } > /dev/null
-                    then
+                  then
-                      ${create}
+                    ${create}
-                    fi
+                  fi
-                  '';
+                '';
-                in
+              in [
-                [
+                ''local diskPath="$(find -L /dev/disk/by-diskseq -samefile ${diskVar})"''
-                  ''local diskPath="$(find -L /dev/disk/by-diskseq -samefile ${diskVar})"''
+                ''local ${partVarName}="$diskPath-part${toString index}"''
-                  ''local ${partVarName}="$diskPath-part${toString index}"''
+                (if keepExisting then fallback else create)
-                  (if keepExisting then fallback else create)
+                "sudo ${labelScripts.${format} label}"
-                  "sudo ${labelScripts.${format} label}"
+              ]) partitions));
-                ]
-              )
-              partitions));
 
-          fixType = lib.strings.concatLines (builtins.concatMap
+        fixType = lib.strings.concatLines (builtins.concatMap (
-            (
+          partition:
-              partition:
+            lib.optional
-              lib.optional
+              (partition.keepExisting && !(builtins.isNull partition.type))
-                (partition.keepExisting && !(builtins.isNull partition.type))
+              ''sudo sfdisk --part-type ${diskVar} ${toString partition.index} ${mkType partition.type}'')
-                ''sudo sfdisk --part-type ${diskVar} ${toString partition.index} ${mkType partition.type}''
+          partitions);
-            )
+      in {
-            partitions);
+        id = if osDisk then "os" else "disk-${name}";
-        in
+        deviceVariable = diskVar;
-        {
-          id = if osDisk then "os" else "disk-${name}";
-          deviceVariable = diskVar;
 
-          deviceScript =
+        deviceScript = if osDisk && config.devicePath == null then ''
-            if osDisk && config.devicePath == null then ''
+          ${diskSelector}
-              ${diskSelector}
+        '' else ''
-            '' else ''
+          ${diskVarName}=${config.devicePath}
-              ${diskVarName}=${config.devicePath}
+          ${if osDisk then ''
-              ${if osDisk then ''
+            if [ ! -b ${diskVar} ]; then
-                if [ ! -b ${diskVar} ]; then
+              function fallback() {
-                  function fallback() {
+                echo "Couldn't find the specified disk \"${diskVar}\"."
-                    echo "Couldn't find the specified disk \"${diskVar}\"."
+                if fish ${./confirm.fish} "Do you want to install the OS on another disk?"; then
-                    if fish ${./confirm.fish} "Do you want to install the OS on another disk?"; then
+                  ${diskSelector}
-                      ${diskSelector}
+                else
-                    else
+                  exit 1
-                      exit 1
-                    fi
-                  }
-
-                  fallback
                 fi
-              '' else
+              }
-                ""}
-            '';
 
-          script = lib.mkDefault ''
+              fallback
-            function partition() {
+            fi
-              ${if (!config.wipe) then cleanup else ""}
+          '' else
-              ${probeScript}
+            ""}
-              ${fdiskCommands}
+        '';
-              ${fixType}
-            }
 
-            partition
+        script = lib.mkDefault ''
-          '';
+          function partition() {
-        };
+            ${if (!config.wipe) then cleanup else ""}
-    }
+            ${probeScript}
-  );
+            ${fdiskCommands}
+            ${fixType}
+          }
+
+          partition
+        '';
+      };
+    });
 
   partitionType = types.submodule (
     { name, config, ... }: {
@@ -241,11 +228,10 @@ let
         format = mkOption {
           type = types.enum (builtins.attrValues fs);
           description = "The file system format of the partition.";
-          default =
+          default = if (isSwap config) then
-            if (isSwap config) then
+            fs.swap
-              fs.swap
+          else
-            else
+            throw ("Partition format not specified.");
-              throw ("Partition format not specified.");
         };
 
         size = mkOption {
@@ -285,10 +271,8 @@ let
         else
           "echo ${lib.strings.escapeShellArg (toString config.size)}");
       };
-    }
+    });
-  );
+in {
-in
-{
   options = {
     valhalla = {
       partition = {
@@ -320,50 +304,41 @@ in
   config = {
     valhalla = {
       partition = {
-        script = lib.mkDefault (
+        script = lib.mkDefault (let
-          let
+          cfg = config.valhalla.partition;
-            cfg = config.valhalla.partition;
+          inherit (cfg) os rootDir;
-            inherit (cfg) os rootDir;
+          inherit (lib.strings) normalizePath;
-            inherit (lib.strings) normalizePath;
+          partPath = part: "/dev/disk/by-label/${part.label}";
-            partPath = part: "/dev/disk/by-label/${part.label}";
+          disks = ([ os ] ++ (builtins.attrValues cfg.disks));
-            disks = ([ os ] ++ (builtins.attrValues cfg.disks));
+          partitions = (builtins.concatMap (_: (builtins.attrValues _.partitions)) disks);
-            partitions = (builtins.concatMap (_: (builtins.attrValues _.partitions)) disks);
 
-            mountScript = lib.strings.concatLines (builtins.concatMap
+          mountScript = lib.strings.concatLines (builtins.concatMap (
-              (
+            _: [
-                _: [
+              probeScript
-                  probeScript
+              (builtins.concatStringsSep " " ([
-                  (builtins.concatStringsSep " " ([
+                  "sudo"
-                    "sudo"
+                  "mount"
-                    "mount"
+                  "--mkdir"
-                    "--mkdir"
+                ] ++ (lib.optionals (_.format == "ntfs") [
-                  ] ++ (lib.optionals (_.format == "ntfs") [
+                  "-t" "ntfs3"
-                    "-t"
+                ]) ++ [
-                    "ntfs3"
+                  (builtins.concatStringsSep " " (builtins.map (_: "-o ${_}") _.mountOptions))
-                  ]) ++ [
+                  (partPath _)
-                    (builtins.concatStringsSep " " (builtins.map (_: "-o ${_}") _.mountOptions))
+                  (normalizePath "/${rootDir}/${_.mountPoint}")
-                    (partPath _)
+                ]))
-                    (normalizePath "/${rootDir}/${_.mountPoint}")
+            ]) (lib.lists.sortOn
-                  ]))
+              (_: normalizePath "/${_.mountPoint}")
-                ]
-              )
-              (lib.lists.sortOn
-                (_: normalizePath "/${_.mountPoint}")
                 (builtins.filter (_: _.mountPoint != null) partitions)));
 
-            swapScript = lib.strings.concatLines (builtins.map
+          swapScript = lib.strings.concatLines (builtins.map (
-              (
+            _: ''
-                _: ''
+              ${probeScript}
-                  ${probeScript}
+              sudo swapon ${partPath _}
-                  sudo swapon ${partPath _}
+            '') (builtins.filter (_: _.useSwap) partitions));
-                ''
+        in lib.strings.concatLines ([
-              )
+          "#!/bin/bash"
-              (builtins.filter (_: _.useSwap) partitions));
+          "set -o errexit"
-          in
+        ]
-          lib.strings.concatLines ([
-            "#!/bin/bash"
-            "set -o errexit"
-          ]
           ++ (builtins.map (_: _.deviceScript) disks)
           ++ lib.optionals ((builtins.length disks) > 0) [
             ''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
@@ -378,8 +353,7 @@ in
           ] ++ (builtins.map (_: _.script) disks) ++ [
             mountScript
             swapScript
-          ])
+          ]));
-        );
       };
     };
   };

lib/modules/programs.nix

@@ -11,85 +11,77 @@ let
         };
 
         config = {
-          programs = builtins.mapAttrs
+          programs = builtins.mapAttrs (
-            (
+            name: config: {
-              name: config: {
+              enable = mkDefault config.enable;
-                enable = mkDefault config.enable;
+            }) osConfig.programs;
-              }
+      };
-            )
+    }));
-            osConfig.programs;
-        };
-      }
-    ));
   };
 
-  mkPrograms = infos: builtins.foldl'
+  mkPrograms = infos: builtins.foldl' (programs: info:
-    (programs: info:
+    programs // {
-      programs // {
+      ${builtins.elemAt info 0} = {
-        ${builtins.elemAt info 0} = {
+        enable = mkEnableOption (builtins.elemAt info 1);
-          enable = mkEnableOption (builtins.elemAt info 1);
+      };
-        };
+    }) { } infos;
-      })
-    { }
-    infos;
 
   programs = mkPrograms [
-    [ "aliae" "aliae" ]
+    ["aliae" "aliae"]
-    [ "brave" "Brave Browser" ]
+    ["brave" "Brave Browser"]
-    [ "discord" "Discord" ]
+    ["discord" "Discord"]
-    [ "firefox" "Firefox Web Browser" ]
+    ["firefox" "Firefox Web Browser"]
-    [ "openssh" "OpenSSH" ]
+    ["openssh" "OpenSSH"]
-    [ "osu!lazer" "osu!lazer" ]
+    ["osu!lazer" "osu!lazer"]
-    [ "pennywise" "Pennywise" ]
+    ["pennywise" "Pennywise"]
-    [ "powershell" "PowerShell Core" ]
+    ["powershell" "PowerShell Core"]
-    [ "retroarch" "RetroArch" ]
+    ["retroarch" "RetroArch"]
-    [ "steam" "Steam" ]
+    ["steam" "Steam"]
-    [ "thunderbird" "Thunderbird" ]
+    ["thunderbird" "Thunderbird"]
-    [ "vscode" "Visual Studio Code" ]
+    ["vscode" "Visual Studio Code"]
-    [ "zoxide" "zoxide" ]
+    ["zoxide" "zoxide"]
   ];
 
   linuxPrograms = mkPrograms [
-    [ "bash" "Bash" ]
+    ["bash" "Bash"]
-    [ "fish" "fish" ]
+    ["fish" "fish"]
-    [ "icedtea" "IcedTea" ]
+    ["icedtea" "IcedTea"]
-    [ "grub" "GRUB" ]
+    ["grub" "GRUB"]
-    [ "logo-ls" "logo-ls" ]
+    ["logo-ls" "logo-ls"]
-    [ "lutris" "Lutris" ]
+    ["lutris" "Lutris"]
-    [ "minegrub-theme" "Minegrub Theme" ]
+    ["minegrub-theme" "Minegrub Theme"]
-    [ "nginx" "nginx" ]
+    ["nginx" "nginx"]
-    [ "nodejs-n" "n" ]
+    ["nodejs-n" "n"]
-    [ "nuke-usb" "nuke-usb" ]
+    ["nuke-usb" "nuke-usb"]
-    [ "nvidia-dkms" "Nvidia Drivers" ]
+    ["nvidia-dkms" "Nvidia Drivers"]
-    [ "plasma" "Plasma" ]
+    ["plasma" "Plasma"]
-    [ "pyenv" "pyenv" ]
+    ["pyenv" "pyenv"]
-    [ "sddm" "SDDM" ]
+    ["sddm" "SDDM"]
-    [ "vim" "Vim" ]
+    ["vim" "Vim"]
-    [ "virt-manager" "Virtual Machine Manager" ]
+    ["virt-manager" "Virtual Machine Manager"]
-    [ "waydroid" "Waydroid" ]
+    ["waydroid" "Waydroid"]
-    [ "xone" "xone" ]
+    ["xone" "xone"]
   ];
 
   windowsPrograms = mkPrograms [
-    [ "lghub" "Logitech G Hub" ]
+    ["lghub" "Logitech G Hub"]
-    [ "maniaplanet" "ManiaPlanet" ]
+    ["maniaplanet" "ManiaPlanet"]
-    [ "msedge-redirect" "MSEdgeRedirect" ]
+    ["msedge-redirect" "MSEdgeRedirect"]
-    [ "nvs" "Node Version Switcher" ]
+    ["nvs" "Node Version Switcher"]
-    [ "osu!" "Osu!" ]
+    ["osu!" "Osu!"]
-    [ "posh-git" "posh-git" ]
+    ["posh-git" "posh-git"]
-    [ "putty" "PuTTY" ]
+    ["putty" "PuTTY"]
-    [ "rewasd" "reWASD" ]
+    ["rewasd" "reWASD"]
-    [ "terminal-icons" "Terminal Icons" ]
+    ["terminal-icons" "Terminal Icons"]
-    [ "tm-nations-forever" "TrackMania Nations Forever" ]
+    ["tm-nations-forever" "TrackMania Nations Forever"]
-    [ "tm-united-forever" "TrackMania United Forever" ]
+    ["tm-united-forever" "TrackMania United Forever"]
-    [ "tobii-gamehub" "Tobii Game Hub" ]
+    ["tobii-gamehub" "Tobii Game Hub"]
-    [ "tobii-ghost" "Tobii Ghost" ]
+    ["tobii-ghost" "Tobii Ghost"]
-    [ "ubiquiti-unifi-controller" "Ubiquiti UniFi Controller" ]
+    ["ubiquiti-unifi-controller" "Ubiquiti UniFi Controller"]
-    [ "visualstudio" "Visual Studio" ]
+    ["visualstudio" "Visual Studio"]
-    [ "winscp" "WinSCP" ]
+    ["winscp" "WinSCP"]
   ];
-in
+in {
-{
   imports = [
     ./programs/docker.nix
     ./programs/git.nix

lib/modules/programs/docker.nix

@@ -5,8 +5,7 @@ let
   commonOptions = {
     enable = mkEnableOption "docker";
   };
-in
+in {
-{
   options = {
     valhalla = {
       programs.docker = commonOptions;
@@ -17,8 +16,7 @@ in
             options = {
               programs.docker = commonOptions;
             };
-          }
+          }));
-        ));
       };
 
       linux = {

lib/modules/programs/git.nix

@@ -31,8 +31,7 @@ let
       default = { };
     };
   };
-in
+in {
-{
   options = {
     valhalla = {
       programs.git = gitOption;
@@ -43,8 +42,7 @@ in
             options = {
               programs.git = gitOption;
             };
-          }
+          }));
-        ));
       };
     };
   };

lib/modules/programs/nextcloud.nix

@@ -31,8 +31,7 @@ let
       default = [ ];
     };
   };
-in
+in {
-{
   options = {
     valhalla = {
       programs.nextcloud = commonOptions;
@@ -43,8 +42,7 @@ in
             options = {
               programs.nextcloud = commonOptions;
             };
-          }
+          }));
-        ));
       };
 
       windows.users = mkOption {
@@ -53,8 +51,7 @@ in
             options = {
               programs.nextcloud = userOptions;
             };
-          }
+          }));
-        ));
       };
     };
   };

lib/modules/programs/oh-my-posh.nix

@@ -16,8 +16,7 @@ let
           default = lib.strings.removeSuffix ".omp" (lib.strings.removeSuffix ".json" (builtins.baseNameOf config.source));
         };
       };
-    }
+    });
-  );
 
   commonOptions = {
     enable = mkEnableOption "Oh My Posh";
@@ -36,8 +35,7 @@ let
       default = [ ];
     };
   };
-in
+in {
-{
   options = {
     valhalla = {
       programs.oh-my-posh = commonOptions;
@@ -48,8 +46,7 @@ in
             options = {
               programs.oh-my-posh = userOptions;
             };
-          }
+          }));
-        ));
       };
     };
   };

lib/modules/programs/rclone.nix

@@ -16,8 +16,7 @@ let
           default = null;
         };
       };
-    }
+    });
-  );
 
   commonOptions = {
     enable = mkEnableOption "rclone";
@@ -30,8 +29,7 @@ let
       default = { };
     };
   };
-in
+in {
-{
   options = {
     valhalla.linux = {
       programs.rclone = commonOptions;
@@ -42,8 +40,7 @@ in
             options = {
               programs.rclone = userOptions;
             };
-          }
+          }));
-        ));
       };
     };
   };

lib/modules/software.nix

@@ -1,156 +1,150 @@
 { lib, ... }:
-let inherit (lib) mkOption types;
+  let inherit (lib) mkOption types;
-in {
+  in {
-  imports = [
+    imports = [
-    ./programs.nix
+      ./programs.nix
-  ];
+    ];
 
-  options = {
+    options = {
-    valhalla = mkOption {
+      valhalla = mkOption {
-      type = types.submodule (
+        type = types.submodule (
-        { config, ... }:
+          { config, ... }:
-        let
+            let
-          optionalAttrs = lib.attrsets.optionalAttrs;
+              optionalAttrs = lib.attrsets.optionalAttrs;
-          cfg = config;
+              cfg = config;
-          inherit (cfg.software) coding desktopExperience essential gaming server socialMedia;
+              inherit (cfg.software) coding desktopExperience essential gaming server socialMedia;
 
-          mkPrograms = programs: builtins.foldl'
+              mkPrograms = programs: builtins.foldl' (
-            (
+                programs: name: programs // {
-              programs: name: programs // {
+                  ${name}.enable = true;
-                ${name}.enable = true;
+                }) {} programs;
-              }
+            in {
-            )
+              options = {
-            { }
+                software = {
-            programs;
+                  essential = mkOption {
-        in
+                    type = types.bool;
-        {
+                    description = "A value indicating whether essentials should be installed.";
-          options = {
+                    default = false;
-            software = {
+                  };
-              essential = mkOption {
+
-                type = types.bool;
+                  server = mkOption {
-                description = "A value indicating whether essentials should be installed.";
+                    type = types.bool;
-                default = false;
+                    description = "A value indicating whether server applications should be installed.";
+                    default = false;
+                  };
+
+                  desktopExperience = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether GUI apps should be installed.";
+                    default = false;
+                  };
+
+                  school = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether software for studies should be installed.";
+                    default = false;
+                  };
+
+                  productivity = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether productivity apps should be installed.";
+                    default = false;
+                  };
+
+                  socialMedia = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether social media apps should be installed.";
+                    default = false;
+                  };
+
+                  media = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether media apps should be installed.";
+                    default = false;
+                  };
+
+                  gaming = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether gaming apps should be installed.";
+                    default = false;
+                  };
+
+                  coding = mkOption {
+                    type = types.bool;
+                    description = "A value indicating whether development apps should be installed.";
+                    default = false;
+                  };
+                };
               };
 
-              server = mkOption {
+              config = {
-                type = types.bool;
+                programs = (optionalAttrs essential (mkPrograms [
-                description = "A value indicating whether server applications should be installed.";
+                  "aliae"
-                default = false;
+                  "git"
+                  "oh-my-posh"
+                  "openssh"
+                  "powershell"
+                  "zoxide"
+                ])) // (optionalAttrs desktopExperience (mkPrograms [
+                  "brave"
+                  "firefox"
+                  "pennywise"
+                  "thunderbird"
+                ])) // (optionalAttrs socialMedia (mkPrograms [
+                  "discord"
+                ])) // (optionalAttrs coding (mkPrograms [
+                  "docker"
+                  "vscode"
+                ])) // (optionalAttrs gaming (mkPrograms [
+                  "osu!lazer"
+                  "retroarch"
+                  "steam"
+                ]));
+
+                linux.programs = (optionalAttrs essential (mkPrograms [
+                  "bash"
+                  "logo-ls"
+                  "minegrub-theme"
+                  "nuke-usb"
+                  "vim"
+                ])) // (optionalAttrs desktopExperience (mkPrograms [
+                  "icedtea"
+                  "plasma"
+                  "sddm"
+                  "waydroid"
+                  "virt-manager"
+                ])) // (optionalAttrs coding (mkPrograms [
+                  "nodejs-n"
+                  "pyenv"
+                ])) // (optionalAttrs gaming (mkPrograms [
+                  "lutris"
+                ])) // (optionalAttrs server (mkPrograms [
+                  "nginx"
+                ]));
+
+                # Essentials
+                windows.programs = (optionalAttrs essential (mkPrograms [
+                  "posh-git"
+                  "terminal-icons"
+                # Desktop Experience
+                ])) // (optionalAttrs desktopExperience (mkPrograms [
+                  "msedge-redirect"
+                  "putty"
+                  "winscp"
+                # Development
+                ])) // (optionalAttrs coding (mkPrograms [
+                  "nvs"
+                  "visualstudio"
+                # Gaming
+                ])) // (optionalAttrs gaming (mkPrograms [
+                  "maniaplanet"
+                  "osu!"
+                  "rewasd"
+                  "tm-nations-forever"
+                  "tm-united-forever"
+                ]));
               };
-
+            });
-              desktopExperience = mkOption {
+      };
-                type = types.bool;
-                description = "A value indicating whether GUI apps should be installed.";
-                default = false;
-              };
-
-              school = mkOption {
-                type = types.bool;
-                description = "A value indicating whether software for studies should be installed.";
-                default = false;
-              };
-
-              productivity = mkOption {
-                type = types.bool;
-                description = "A value indicating whether productivity apps should be installed.";
-                default = false;
-              };
-
-              socialMedia = mkOption {
-                type = types.bool;
-                description = "A value indicating whether social media apps should be installed.";
-                default = false;
-              };
-
-              media = mkOption {
-                type = types.bool;
-                description = "A value indicating whether media apps should be installed.";
-                default = false;
-              };
-
-              gaming = mkOption {
-                type = types.bool;
-                description = "A value indicating whether gaming apps should be installed.";
-                default = false;
-              };
-
-              coding = mkOption {
-                type = types.bool;
-                description = "A value indicating whether development apps should be installed.";
-                default = false;
-              };
-            };
-          };
-
-          config = {
-            programs = (optionalAttrs essential (mkPrograms [
-              "aliae"
-              "git"
-              "oh-my-posh"
-              "openssh"
-              "powershell"
-              "zoxide"
-            ])) // (optionalAttrs desktopExperience (mkPrograms [
-              "brave"
-              "firefox"
-              "pennywise"
-              "thunderbird"
-            ])) // (optionalAttrs socialMedia (mkPrograms [
-              "discord"
-            ])) // (optionalAttrs coding (mkPrograms [
-              "docker"
-              "vscode"
-            ])) // (optionalAttrs gaming (mkPrograms [
-              "osu!lazer"
-              "retroarch"
-              "steam"
-            ]));
-
-            linux.programs = (optionalAttrs essential (mkPrograms [
-              "bash"
-              "logo-ls"
-              "minegrub-theme"
-              "nuke-usb"
-              "vim"
-            ])) // (optionalAttrs desktopExperience (mkPrograms [
-              "icedtea"
-              "plasma"
-              "sddm"
-              "waydroid"
-              "virt-manager"
-            ])) // (optionalAttrs coding (mkPrograms [
-              "nodejs-n"
-              "pyenv"
-            ])) // (optionalAttrs gaming (mkPrograms [
-              "lutris"
-            ])) // (optionalAttrs server (mkPrograms [
-              "nginx"
-            ]));
-
-            # Essentials
-            windows.programs = (optionalAttrs essential (mkPrograms [
-              "posh-git"
-              "terminal-icons"
-              # Desktop Experience
-            ])) // (optionalAttrs desktopExperience (mkPrograms [
-              "msedge-redirect"
-              "putty"
-              "winscp"
-              # Development
-            ])) // (optionalAttrs coding (mkPrograms [
-              "nvs"
-              "visualstudio"
-              # Gaming
-            ])) // (optionalAttrs gaming (mkPrograms [
-              "maniaplanet"
-              "osu!"
-              "rewasd"
-              "tm-nations-forever"
-              "tm-united-forever"
-            ]));
-          };
-        }
-      );
     };
-  };
+  }
-}

lib/modules/users.nix

@@ -25,8 +25,7 @@ let
           default = [ ];
         };
       };
-    }
+    });
-  );
 
   linuxUserType = types.submodule (
     { ... }: {
@@ -37,8 +36,7 @@ let
           default = null;
         };
       };
-    }
+    });
-  );
 
   winUserType = types.submodule (
     { ... }: {
@@ -49,10 +47,8 @@ let
           default = false;
         };
       };
-    }
+    });
-  );
+in {
-in
-{
   options = {
     valhalla = {
       users = mkOption {

lib/modules/windows.nix

@@ -2,8 +2,7 @@
 let
   inherit (lib) mkDefault mkEnableOption mkIf mkOption types;
   capitalize = (import ../text.nix { inherit lib; }).capitalize;
-in
+in {
-{
   options = {
     valhalla = {
       windows = {

lib/text.nix

@@ -2,6 +2,6 @@
   capitalize = text:
     let chars = lib.strings.stringToCharacters text;
     in lib.strings.concatStrings
-      ([ (lib.strings.toUpper (builtins.elemAt chars 0)) ]
+    ([ (lib.strings.toUpper (builtins.elemAt chars 0)) ]
-        ++ (lib.lists.drop 1 chars));
+      ++ (lib.lists.drop 1 chars));
 }

profiles/machines/manuel/Generic/config.nix

@@ -37,13 +37,12 @@ in {
       keyboardLayout = "ch";
 
       i18n = {
-        localeSettings =
+        localeSettings = let defaultLocale = "en_US.UTF-8";
-          let defaultLocale = "en_US.UTF-8";
+        in {
-          in {
+          LANG = "de_CH.UTF-8";
-            LANG = "de_CH.UTF-8";
+          LANGUAGE = defaultLocale;
-            LANGUAGE = defaultLocale;
+          LC_MESSAGE = defaultLocale;
-            LC_MESSAGE = defaultLocale;
+        };
-          };
       };
 
       software = {
@@ -59,46 +58,45 @@ in {
       linux.programs.grub.enable = true;
 
       programs = {
-        git =
+        git = let defaultBranch = "main";
-          let defaultBranch = "main";
+        in {
-          in {
+          inherit defaultBranch;
-            inherit defaultBranch;
 
-            flow = {
+          flow = {
-              mainBranch = defaultBranch;
+            mainBranch = defaultBranch;
-              devBranch = "dev";
+            devBranch = "dev";
-            };
-
-            aliases = {
-              ahfange = "init";
-              tuedezue = "add";
-              beschuldig = "blame";
-              zieh = "pull";
-              druck = "push";
-              machnah = "clone";
-              hol = "fetch";
-              zwiigab = "branch";
-              buechiih = "commit";
-              eich = "rebase";
-              erd = "rebase";
-              gahufwiifelde = "rebase";
-              vergliich = "diff";
-              tuezemme = "merge";
-              versorg = "stash";
-              markier = "tag";
-              pflueckoepfel = "cherry-pick";
-              pflueckhimbeeri = "cherry-pick";
-              buechuus = "checkout";
-              quaetsch = "merge --squash";
-              pfudle = "push --force";
-              beschuldigung = "blame";
-              zwiigli = "branch";
-              tagebuech = "log";
-              versteck = "stash";
-              zuestand = "status";
-              markierig = "tag";
-            };
           };
+
+          aliases = {
+            ahfange = "init";
+            tuedezue = "add";
+            beschuldig = "blame";
+            zieh = "pull";
+            druck = "push";
+            machnah = "clone";
+            hol = "fetch";
+            zwiigab = "branch";
+            buechiih = "commit";
+            eich = "rebase";
+            erd = "rebase";
+            gahufwiifelde = "rebase";
+            vergliich = "diff";
+            tuezemme = "merge";
+            versorg = "stash";
+            markier = "tag";
+            pflueckoepfel = "cherry-pick";
+            pflueckhimbeeri = "cherry-pick";
+            buechuus = "checkout";
+            quaetsch = "merge --squash";
+            pfudle = "push --force";
+            beschuldigung = "blame";
+            zwiigli = "branch";
+            tagebuech = "log";
+            versteck = "stash";
+            zuestand = "status";
+            markierig = "tag";
+          };
+        };
       };
     };
   };

profiles/machines/manuel/server.nix

@@ -38,13 +38,12 @@ in {
       keyboardLayout = "ch";
 
       i18n = {
-        localeSettings =
+        localeSettings = let defaultLocale = "en_US.UTF-8";
-          let defaultLocale = "en_US.UTF-8";
+        in {
-          in {
+          LANG = "de_CH.UTF-8";
-            LANG = "de_CH.UTF-8";
+          LANGUAGE = defaultLocale;
-            LANGUAGE = defaultLocale;
+          LC_MESSAGE = defaultLocale;
-            LC_MESSAGE = defaultLocale;
+        };
-          };
       };
 
       software = {

profiles/users/manuel/desktop.nix

@@ -29,22 +29,20 @@
       windows.users.manuel = {
         programs = {
           nextcloud = {
-            folderSyncs =
+            folderSyncs = let
-              let
+              localPath = "C:/tools/RetroArch-Win64";
-                localPath = "C:/tools/RetroArch-Win64";
+              remotePath = "/Saved Games/RetroArch";
-                remotePath = "/Saved Games/RetroArch";
+            in [
-              in
+              {
-              [
+                remotePath = "${remotePath}/Saves";
-                {
+                localPath = "${localPath}/saves";
-                  remotePath = "${remotePath}/Saves";
+                virtualFiles = false;
-                  localPath = "${localPath}/saves";
+              }
-                  virtualFiles = false;
+              {
-                }
+                remotePath = "${remotePath}/System";
-                {
+                localPath = "${localPath}/system";
-                  remotePath = "${remotePath}/System";
+              }
-                  localPath = "${localPath}/system";
+            ];
-                }
-              ];
           };
         };
       };

scripts/Arch/Config/SecureBoot/main.fish

@@ -20,11 +20,11 @@ begin
         sudo sed -i \
             -e "/esp=/{" \
                 -e "a esp=$(echo "$efiDir" | string escape)" \
-                -e d \
+                -e "d" \
             -e "}" \
             -e "/bootloader_id=/{" \
                 -e "a bootloader_id=$(echo "$label" | string escape)" \
-                -e d \
+                -e "d" \
             -e "}" \
             /etc/secureboot.conf
 

scripts/Arch/OS/setup.fish

@@ -61,7 +61,7 @@ begin
             and arch-chroot "$mountDir" hwclock --systohc
 
             and begin
-                getOSConfig i18n.localeSettings --json |
+                getOSConfig i18n.localeSettings --json | \
                     jq --raw-output '[.[] | split(".") | .[0]] | unique | join("\\\\|")'
             end | begin
                 read LOCALES
@@ -70,7 +70,7 @@ begin
             end
 
             and begin
-                getOSConfig i18n.localeSettings --json |
+                getOSConfig i18n.localeSettings --json | \
                     jq --raw-output '[keys[] as $key | "\($key)=\(.[$key])"] | join("\n")'
             end | arch-chroot "$mountDir" tee /etc/locale.conf >/dev/null
 

scripts/Arch/lib/deploy.fish

@@ -147,7 +147,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
         and yayinst propertree-git # mac .plist config file editor
     end
 
-    and if isProgramEnabled thunderbird && $isInstall
+    and if isProgramEnabled "thunderbird" && $isInstall
         yayinst thunderbird
     end
 
@@ -200,7 +200,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 audius-client-bin
         end
 
-        and if isProgramEnabled nextcloud
+        and if isProgramEnabled "nextcloud"
             yayinst nextcloud-client
         end
     end
@@ -210,11 +210,11 @@ function deploySoftware -d "Deploys a the specified software action" -a action
     if $isInstall
         if collectionActive socialMedia
             yayinst signal-desktop
-
+    
             and begin
                 yes y | runYay threema-desktop
             end
-
+    
             and begin
                 yes y | runYay nodejs
             end
@@ -279,12 +279,12 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 and sudo flatpak install -y flathub com.usebottles.bottles
             end
         end
-
+                    
         and if isProgramEnabled "osu!lazer"
             yayinst osu-lazer-bin
         end
 
-        and if isProgramEnabled retroarch
+        and if isProgramEnabled "retroarch"
             yayinst libretro
         end
     end

scripts/Common/OS/backup.fish

@@ -20,15 +20,15 @@ function backupAction -V dir
             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
             read -xP "Please specify the path to the key file for logging in to the SSH server: " VALHALLA_BACKUP_SERVER_KEY
-
+    
             if [ -z "$VALHALLA_BACKUP_SERVER_PORT" ]
                 set -x VALHALLA_BACKUP_SERVER_PORT 22
             end
-
+    
             if [ -n "$VALHALLA_BACKUP_SERVER_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."
@@ -54,7 +54,7 @@ function backupAction -V dir
         if [ -n "$deployScript" ]
             for name in (getUsers | jq '.[]' --raw-output0 | string split0)
                 echo "Backing up user `$name`..."
-                and source $deployScript userBackup --user $name
+                and source $deployScript userBackup $name
             end
         end
     end

scripts/Common/OS/install.fish

@@ -34,7 +34,7 @@ function installAction -V dir
 
             for name in (getUsers | jq '.[]' --raw-output0 | string split0)
                 echo "Configuring user `$name`..."
-                and source $deployScript userConfig --user $name
+                and source $deployScript userConfig $name
             end
         end
     end

scripts/Common/Software/docker/main.fish

@@ -18,7 +18,7 @@ begin
         argparse -i "name=" "user=" -- $argv
         set -l services (getProgramConfig --name "$_flag_name" --json | jq '.services')
 
-        for service in (echo "$services" | jq '. // {} | keys[]' --raw-output0 | string split0)
+        for service in (echo "$services" | jq '. | keys[]' --raw-output0 | string split0)
 
             if echo "$services" | SERVICE=$service jq --exit-status ".[env.SERVICE].enable" >/dev/null
                 fish "$dir/services/$service/main.fish" $argv

scripts/Common/Software/docker/services/anki-sync/main.fish

@@ -12,7 +12,7 @@ begin
         initializeServiceInstallation $argv
         sudo cp "$dir/docker-compose.base.yml" (getServiceRoot $argv)
 
-        USER=$user yq "$userKey = env(USER)" "$source" |
+        USER=$user yq "$userKey = env(USER)" "$source" | \
             sudo tee (getServiceOverrides $argv) >/dev/null
 
         installDockerService $argv

scripts/Common/Software/docker/services/drone/main.fish

@@ -52,8 +52,8 @@ begin
             end
 
             CI_NAME=$ciName \
-                SECRET_ENV="$name.secret.env" \
+            SECRET_ENV="$name.secret.env" \
-                RUNNER_ENV="$name.runner.env" begin
+            RUNNER_ENV="$name.runner.env" begin
                 begin
                     printf "%s\n" \
                         DRONE_RPC_PROTO=http \
@@ -62,28 +62,28 @@ begin
 
                 echo "DRONE_RPC_SECRET=$secret" | sudo tee "$root/$SECRET_ENV" >/dev/null
 
-                yq "$ciKey = $ciTemplate" "$tmpConfig" |
+                yq "$ciKey = $ciTemplate" "$tmpConfig" | \
-                    ENTRY="./data/$name:/data" yq "$ciKey.volumes = [ env(ENTRY) ]" |
+                    ENTRY="./data/$name:/data" yq "$ciKey.volumes = [ env(ENTRY) ]" | \
-                    yq "$ciKey.env_file |= . + [ env(SECRET_ENV) ]" |
+                    yq "$ciKey.env_file |= . + [ env(SECRET_ENV) ]" | \
-                    PROTO=https yq "$ciEnv.DRONE_SERVER_PROTO = env(PROTO)" |
+                    PROTO=https yq "$ciEnv.DRONE_SERVER_PROTO = env(PROTO)" | \
-                    HOST=(getServiceDomain "$subdomain" "$domain") yq "$ciEnv.DRONE_SERVER_HOST = env(HOST)" |
+                    HOST=(getServiceDomain "$subdomain" "$domain") yq "$ciEnv.DRONE_SERVER_HOST = env(HOST)" | \
-                    yq "$dockerKey = $dockerTemplate" |
+                    yq "$dockerKey = $dockerTemplate" | \
-                    yq "$sshKey = $sshTemplate" |
+                    yq "$sshKey = $sshTemplate" | \
-                    yq "$dockerKey.depends_on = [ env(CI_NAME) ]" |
+                    yq "$dockerKey.depends_on = [ env(CI_NAME) ]" | \
                     sudo tee "$config" >/dev/null
 
                 for key in $dockerKey $sshKey
                     set -l file (mktemp)
 
-                    yq "$key.depends_on = [ env(CI_NAME) ]" "$config" |
+                    yq "$key.depends_on = [ env(CI_NAME) ]" "$config" | \
-                        yq "$key.env_file |= . + [ env(RUNNER_ENV), env(SECRET_ENV) ]" |
+                        yq "$key.env_file |= . + [ env(RUNNER_ENV), env(SECRET_ENV) ]" | \
                         tee "$file" >/dev/null
 
                     sudo cp "$file" "$config"
                     rm "$file"
                 end
 
-                PORT="127.0.0.1:1337:80" yq "$ciKey.ports = [ env(PORT) ]" "$tmpOverrides" |
+                PORT="127.0.0.1:1337:80" yq "$ciKey.ports = [ env(PORT) ]" "$tmpOverrides" | \
                     sudo tee "$overrides" >/dev/null
             end
         end
@@ -101,7 +101,7 @@ begin
 
         for i in (seq 1 3 (count $environments))
             set -l domain $environments[(math $i + 2)]
-            set -l subdomain $environments[(math $i + 1)]
+            set -l subdomain  $environments[(math $i + 1)]
             printf "%s\0" "$subdomain" "$domain"
         end
     end

scripts/Common/Software/docker/services/forgejo/main.fish

@@ -1,8 +1,8 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    set -l user forgejo
+    set -l user "forgejo"
-    set -l domain git
+    set -l domain "git"
     set -l server "$domain" ""
     set -l service $user
     source "$dir/../service.fish"
@@ -23,21 +23,21 @@ begin
         set port (yq (getSSHPortKey) "$source" | mutatePort "$port")
 
         DOMAIN=(getServiceDomain $server) PW=$pw DB=Git USER=forgejo PW=$pw begin
-            set -l gitEnv "$(getServiceKey "$service").environment"
+                set -l gitEnv "$(getServiceKey "$service").environment"
-            set -l actEnv "$(getServiceKey "runner").environment"
+                set -l actEnv "$(getServiceKey "runner").environment"
-            set -l dbEnv "$(getServiceKey "db").environment"
+                set -l dbEnv "$(getServiceKey "db").environment"
 
-            PORT=$port yq "$(getSSHPortKey) = env(PORT)" "$source" |
+                PORT=$port yq "$(getSSHPortKey) = env(PORT)" "$source" | \
-                yq "$gitEnv.FORGEJO__server__DOMAIN = env(DOMAIN)" |
+                    yq "$gitEnv.FORGEJO__server__DOMAIN = env(DOMAIN)" | \
-                yq "$gitEnv.FORGEJO__database__NAME = env(DB)" |
+                    yq "$gitEnv.FORGEJO__database__NAME = env(DB)" | \
-                yq "$gitEnv.FORGEJO__database__USER = env(USER)" |
+                    yq "$gitEnv.FORGEJO__database__USER = env(USER)" | \
-                yq "$gitEnv.FORGEJO__database__PASSWD = env(PW)" |
+                    yq "$gitEnv.FORGEJO__database__PASSWD = env(PW)" | \
-                yq "$dbEnv.MARIADB_DATABASE = env(DB)" |
+                    yq "$dbEnv.MARIADB_DATABASE = env(DB)" | \
-                yq "$dbEnv.MARIADB_USER = env(USER)" |
+                    yq "$dbEnv.MARIADB_USER = env(USER)" | \
-                yq "$dbEnv.MARIADB_PASSWORD = env(PW)" |
+                    yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \
-                URL="https://$DOMAIN/" yq "$actEnv.GITEA_INSTANCE_URL = env(URL)" |
+                    URL="https://$DOMAIN/" yq "$actEnv.GITEA_INSTANCE_URL = env(URL)" | \
-                sudo tee "$overrides" >/dev/null
+                    sudo tee "$overrides" >/dev/null
-        end
+            end
 
         installDockerService $argv
     end
@@ -49,7 +49,7 @@ begin
         set -l file (mktemp)
         set -l root (getServiceRoot $argv)
         set -l dir "$root/data"
-        set -l bin /usr/local/bin/forgejo
+        set -l bin "/usr/local/bin/forgejo"
         set -l config "$root/docker-compose.base.yml"
         set -l overrides (getServiceOverrides $argv)
         set -l envKey "$(getServiceKey "$service").environment"
@@ -66,8 +66,8 @@ begin
         set uid (id -u $user)
         set gid (id -g $user)
 
-        and yq "$envKey.USER_UID = $uid" "$file" |
+        and yq "$envKey.USER_UID = $uid" "$file" | \
-            yq "$envKey.USER_GID = $gid" |
+            yq "$envKey.USER_GID = $gid" | \
             sudo tee "$config" >/dev/null
 
         mkdir -p "$dir"

scripts/Common/Software/docker/services/jellyfin/main.fish

@@ -1,8 +1,8 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    set -l user jellyfin
+    set -l user "jellyfin"
-    set -l domain media
+    set -l domain "media"
     set -l server "$domain" ""
     set -l servarr radarr sonarr lidarr prowlarr
     set -l flood flood
@@ -31,7 +31,7 @@ begin
         set -l port
         set -l file (mktemp)
         set -l root (getServiceRoot $argv)
-        set -l bin /usr/local/bin/forgejo
+        set -l bin "/usr/local/bin/forgejo"
         set -l config "$root/docker-compose.base.yml"
         set -l overrides (getServiceOverrides $argv)
         set -l envKey "$(getServiceKey "$service").environment"
@@ -57,13 +57,13 @@ begin
             set -l envKey "$(getServiceKey "$name").environment"
             sudo cp "$config" "$file"
 
-            and yq "$envKey.PUID = $uid" "$file" |
+            and yq "$envKey.PUID = $uid" "$file" | \
-                yq "$envKey.PGID = $gid" |
+                yq "$envKey.PGID = $gid" | \
                 sudo tee "$config" >/dev/null
         end
 
         cp "$overrides" "$file"
-        URL="https://$(getServiceDomain "$domain" "")/" yq "$(getServiceKey "$service").environment.JELLYFIN_PublishedServerUrl = env(URL)" "$file" |
+        URL="https://$(getServiceDomain "$domain" "")/" yq "$(getServiceKey "$service").environment.JELLYFIN_PublishedServerUrl = env(URL)" "$file" | \
             sudo tee "$overrides" >/dev/null
 
         for dir in "$root"/{downloads,config/{,jellyfin,flood,rtorrent,radarr,sonarr,lidarr,prowlarr},media/{,movies,series,music}}
@@ -99,7 +99,7 @@ begin
     function getServiceLocationConfig -a domain s location -V service -V flood
         if [ "$s" = "$service" ]
             set -l argv $argv[4..]
-
+    
             printf "%s\n" \
                 "location = / {" \
                     'return 302 $scheme://$host/web/;' \
@@ -107,13 +107,13 @@ begin
 
             getServiceDefaultProxy $domain $s "$location" --comment "Proxy main Jellyfin traffic" $argv
             getServiceDefaultProxy $domain $s "= /web/" --path "/web/index.html" --comment "Proxy main Jellyfin traffic" $argv
-            getServiceDefaultProxy $domain $s /socket --comment "Proxy Jellyfin Websockets traffic" $argv
+            getServiceDefaultProxy $domain $s "/socket" --comment "Proxy Jellyfin Websockets traffic" $argv
         else if [ "$s" = "$flood" ]
             getServiceDefaultProxy $argv
 
             printf "%s\n" \
                 "location = /flood {" \
-                'return 302 $scheme://$host$uri/$is_args$args;' \
+                    'return 302 $scheme://$host$uri/$is_args$args;' \
                 "}"
         else
             getServiceDefaultProxy $argv --path "$location"
@@ -126,7 +126,7 @@ begin
                 printf "%s\n" \
                     "# Disable buffering when the nginx proxy gets very resource heavy upon streaming" \
                     "proxy_buffering off;"
-            else if [ "$location" = /socket ]
+            else if [ "$location" = "/socket" ]
                 printf "%s\n" \
                     '# Websocket' \
                     "proxy_http_version 1.1;" \

scripts/Common/Software/docker/services/jellyfin/pvpn-cli.py

@@ -7,7 +7,6 @@ import subprocess
 import sys
 from protonvpn_cli.cli import FeatureEnum, protonvpn
 
-
 def run_proton(args):
     exit(
         subprocess.run(
@@ -18,7 +17,6 @@ def run_proton(args):
                 PIPENV_VENV_IN_PROJECT=f"{1}",
                 PVPN_CMD_ARGS=" ".join(args))).returncode)
 
-
 protonvpn.ensure_connectivity()
 
 args = sys.argv[1:]
@@ -58,11 +56,9 @@ else:
     try:
         session.ensure_valid()
     except:
-        raise Exception(
+        raise Exception("Your current session is invalid. Please initialize the session using the `init` subcommand.")
-            "Your current session is invalid. Please initialize the session using the `init` subcommand.")
 
-    environ["PVPN_USERNAME"] = session.vpn_username + \
+    environ["PVPN_USERNAME"] = session.vpn_username + (environ.get("PVPN_TAGS") or "")
-        (environ.get("PVPN_TAGS") or "")
     environ["PVPN_PASSWORD"] = session.vpn_password
     environ["PVPN_TIER"] = f"{session.vpn_tier}"
 
@@ -99,7 +95,6 @@ else:
 
             run_proton(["connect", server.name])
         else:
-            raise Exception(
+            raise Exception(f"Unable to find a server matching the specified criteria {args[1:]}!")
-                f"Unable to find a server matching the specified criteria {args[1:]}!")
     else:
         run_proton(args)

scripts/Common/Software/docker/services/minecraft/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    set -l user minecraft
+    set -l user "minecraft"
     source "$dir/../service.fish"
 
     function installSW -V dir -V domain -V server -V service
@@ -34,8 +34,8 @@ begin
             set -l envKey "$(getServiceKey "$service").environment"
             cp "$config" "$file"
 
-            and yq "$envKey.UID = $uid" "$file" |
+            and yq "$envKey.UID = $uid" "$file" | \
-                yq "$envKey.GID = $gid" |
+                yq "$envKey.GID = $gid" | \
                 sudo tee "$config" >/dev/null
         end
 

scripts/Common/Software/docker/services/nextcloud/main.fish

@@ -5,7 +5,7 @@ begin
     set -l domain cloud ""
     set -l service web
     set -l office collabora
-    set -l officeDomain office ""
+    set -l officeDomain "office" ""
     set -l server $service $domain
 
     set -l services \
@@ -68,13 +68,13 @@ begin
             set -l key "$turnKey.command"
 
             PW="--static-auth-secret=$turnPW" \
-                DOMAIN="--realm=$domain" \
+            DOMAIN="--realm=$domain" \
-                yq "$key |= . + [env(PW), env(DOMAIN)]" "$overridesSource" |
+                yq "$key |= . + [env(PW), env(DOMAIN)]" "$overridesSource" | \
-                DOMAIN=(getServiceDomain $officeDomain) yq "$officeEnv.server_name = env(DOMAIN)" |
+                DOMAIN=(getServiceDomain $officeDomain) yq "$officeEnv.server_name = env(DOMAIN)" | \
-                URL="https://$(string escape --style regex "$DOMAIN"):443" yq "$officeEnv.aliasgroup1 = env(URL)" |
+                URL="https://$(string escape --style regex "$DOMAIN"):443" yq "$officeEnv.aliasgroup1 = env(URL)" | \
                 sudo tee "$overrides" >/dev/null
         end
-
+        
         installDockerService $argv
         set turnPort (yq (getServicePortKey "$turn") "$overrides" | extractPort)
         set turnPort (yq "$portKey" "$overrides" | mutatePort "$turnPort")

scripts/Common/Software/docker/services/ryot/main.fish

@@ -1,8 +1,8 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    set -l domain tracker ""
+    set -l domain "tracker" ""
-    set -l service ryot
+    set -l service "ryot"
     set -l source "$dir/docker-compose.overrides.yml"
     source "$dir/../service.fish"
 
@@ -17,8 +17,8 @@ begin
         initializeServiceInstallation $argv
         sudo cp "$file" "$root"
 
-        URL=$dbUrl yq "$dbKey = env(URL)" "$source" |
+        URL=$dbUrl yq "$dbKey = env(URL)" "$source" | \
-            PW=$pw yq ".services.db.environment.POSTGRES_PASSWORD = env(PW)" |
+            PW=$pw yq ".services.db.environment.POSTGRES_PASSWORD = env(PW)" | \
             sudo tee (getServiceOverrides $argv) >/dev/null
 
         installDockerService $argv

scripts/Common/Software/docker/services/teamspeak/main.fish

@@ -5,26 +5,26 @@ begin
     source "$dir/../service.fish"
 
     function installSW -V dir -V domain -V source
-        set -l service teamspeak
+        set -l service "teamspeak"
         set -l pw (nix-shell -p keepassxc --run "keepassxc-cli generate --length 32")
-        set -l db TeamSpeak
+        set -l db "TeamSpeak"
         set -l tsEnv "$(getServiceKey "$service").environment"
         set -l dbEnv "$(getServiceKey db).environment"
         initializeServiceInstallation $argv
         cp "$dir/docker-compose.base.yml" (getServiceRoot $argv)
 
         USER="$service" begin
-            yq "$tsEnv.TS3SERVER_DB_USER = env(USER)" "$source" |
+            yq "$tsEnv.TS3SERVER_DB_USER = env(USER)" "$source" | \
-                yq "$dbEnv.MARIADB_USER = env(USER)"
+            yq "$dbEnv.MARIADB_USER = env(USER)"
         end | \
-            PW="$pw" begin
+        PW="$pw" begin
-            yq "$tsEnv.TS3SERVER_DB_PASSWORD = env(PW)" |
+            yq "$tsEnv.TS3SERVER_DB_PASSWORD = env(PW)" | \
-                yq "$dbEnv.MARIADB_PASSWORD = env(PW)"
+            yq "$dbEnv.MARIADB_PASSWORD = env(PW)"
+        end | \
+        DB="$db" begin
+            yq "$tsEnv.TS3SERVER_DB_NAME = env(DB)" | \
+            yq "$dbEnv.MARIADB_DATABASE = env(DB)"
         end | \
-            DB="$db" begin
-            yq "$tsEnv.TS3SERVER_DB_NAME = env(DB)" |
-                yq "$dbEnv.MARIADB_DATABASE = env(DB)"
-        end |
             sudo tee (getServiceOverrides $argv) >/dev/null
 
         installDockerService $argv

scripts/Common/Software/docker/services/trackmania/main.fish

@@ -12,8 +12,8 @@ begin
 
         cp -rf "$dir"/{.dockerignore,docker-compose{.base,.overrides,.core{,.overrides}}.yml,parser.patch,tmforever-entrypoint.sh,trackmania.Dockerfile,xaseco-entrypoint.sh,xaseco.Dockerfile} "$root"
 
-        PW="$tmPW" yq "$(getServiceKey "tm").environment.TM_SUPERADMIN_PASSWORD = env(PW)" "$source" |
+        PW="$tmPW" yq "$(getServiceKey "tm").environment.TM_SUPERADMIN_PASSWORD = env(PW)" "$source" | \
-            PW="$sqlPW" yq "$(getServiceKey "db").environment.MYSQL_PASSWORD = env(PW)" |
+            PW="$sqlPW" yq "$(getServiceKey "db").environment.MYSQL_PASSWORD = env(PW)" | \
             sudo tee "$root/$(basename "$source")" >/dev/null
 
         installDockerService $argv
@@ -33,5 +33,5 @@ begin
         echo "^docker-compose\.core\.overrides\.yml\$"
     end
 
-    runInstaller --force $argv --name tm-forever
+    runInstaller --force $argv --name "tm-forever"
 end

scripts/Common/Software/docker/services/trackmania/tmforever-entrypoint.sh

@@ -29,30 +29,30 @@ serverOptions=(
     TM_TITLE name
     TM_COMMENT comment
     TM_HIDDEN hide_server
-    \
+
     TM_MAX_PLAYERS max_players
     TM_PLAYER_PASSWORD password
-    \
+
     TM_MAX_SPECTATORS max_spectators
     TM_SPECTATOR_PASSWORD password_spectator
-    \
+
     TM_LADDER_MODE ladder_mode
     TM_LADDER_LIMIT_MIN ladder_serverlimit_min
     TM_LADDER_LIMIT_MAX ladder_serverlimit_max
-    \
+
     TM_ENABLE_P2P_UPLOAD enable_p2p_upload
     TM_ENABLE_P2P_DOWNLOAD enable_p2p_download
-    \
+
     TM_CALLVOTE_TIMEOUT callvote_timeout
     TM_CALLVOTE_RATIO callvote_ratio
-    \
+
     TM_ALLOW_CHALLENGE_DOWNLOAD allow_challenge_download
     TM_AUTOSAVE_REPLAYS autosave_replays
     TM_AUTOSAVE_VALIDATION_REPLAYS autosave_validation_replays
-    \
+
     TM_REFEREE_PASSWORD referee_password
     TM_REFEREE_VALIDATION_MODE referee_validation_mode
-    \
+
     TM_USE_CHANGING_VALIDATION_SEED use_changing_validation_seed
 )
 
@@ -62,23 +62,23 @@ systemOptions=(
     TM_P2P_PORT server_p2p_port
     TM_CLIENT_PORT client_port
     TM_USE_NAT_UPNP use_nat_upnp
-    \
+
     TM_XMLRPC_PORT xmlrpc_port
     TM_XMLRPC_ALLOWED_REMOTE xmlrpc_allowremote
-    \
+
     TM_PACKMASK packmask
-    \
+
     TM_CONNECTION_UPLOADRATE connection_uploadrate
     TM_CONNECTION_DOWNLOADRATE connection_downloadrate
-    \
+
     TM_P2P_CACHE_SIZE p2p_cache_size
-    \
+
     TM_BLACKLIST_URL blacklist_url
     TM_GUESTLIST_FILENAME guestlist_filename
     TM_BLACKLIST_FILENAME blacklist_filename
-    \
+
     TM_ALLOW_SPECTATOR_RELAYS allow_spectator_relays
-    \
+
     TM_USE_PROXY use_proxy
     TM_PROXY_LOGIN proxy_login
     TM_PROXY_PASSWORD proxy_password

scripts/Common/Software/docker/services/vaultwarden/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    set -l domain passwords
+    set -l domain "passwords"
     set -l source "$dir/docker-compose.overrides.yml"
     source "$dir/../service.fish"
 
@@ -14,10 +14,10 @@ begin
         initializeServiceInstallation $argv
         cp "$dir/docker-compose.base.yml" (getServiceRoot $argv)
 
-        URL="https://$domain.$(getMachineFQDN)" yq "$envKey.DOMAIN = env(URL)" "$source" |
+        URL="https://$domain.$(getMachineFQDN)" yq "$envKey.DOMAIN = env(URL)" "$source" | \
-            ADDRESS="no-reply@$(getMachineFQDN)" yq "$envKey.SMTP_FROM = env(ADDRESS)" |
+            ADDRESS="no-reply@$(getMachineFQDN)" yq "$envKey.SMTP_FROM = env(ADDRESS)" | \
-            URL=$dbUrl yq "$dbKey = env(URL)" |
+            URL=$dbUrl yq "$dbKey = env(URL)" | \
-            PW=$pw yq ".services.db.environment.MARIADB_PASSWORD = env(PW)" |
+            PW=$pw yq ".services.db.environment.MARIADB_PASSWORD = env(PW)" | \
             sudo tee (getServiceOverrides $argv) >/dev/null
 
         installDockerService $argv

scripts/Common/Software/docker/services/wekan/main.fish

@@ -12,7 +12,7 @@ begin
 
         sudo cp "$dir/docker-compose.base.yml" (getServiceRoot $argv)
 
-        URL="https://$domain" yq "$(getServiceKey "$service").environment.ROOT_URL = env(URL)" "$dir/$(basename "$overrides")" |
+        URL="https://$domain" yq "$(getServiceKey "$service").environment.ROOT_URL = env(URL)" "$dir/$(basename "$overrides")" | \
             sudo tee "$overrides" >/dev/null
 
         installDockerService $argv

scripts/Common/Software/docker/services/woodpecker/main.fish

@@ -57,29 +57,29 @@ begin
             end
 
             CI_NAME=$ciName \
-                SECRET_ENV="$name.secret.env" begin
+            SECRET_ENV="$name.secret.env" begin
                 begin
                     echo "WOODPECKER_AGENT_SECRET=$secret"
                 end | sudo tee "$root/$SECRET_ENV" >/dev/null
 
-                yq "$ciKey = $ciTemplate" "$tmpConfig" |
+                yq "$ciKey = $ciTemplate" "$tmpConfig" | \
-                    DB="$dbName" yq "$ciKey.depends_on |= . + [ env(DB) ]" |
+                    DB="$dbName" yq "$ciKey.depends_on |= . + [ env(DB) ]" | \
-                    ENTRY="./data/$name/ci:/var/lib/woodpecker" yq "$ciKey.volumes = [ env(ENTRY) ]" |
+                    ENTRY="./data/$name/ci:/var/lib/woodpecker" yq "$ciKey.volumes = [ env(ENTRY) ]" | \
-                    yq "$ciKey.env_file |= . + [ env(SECRET_ENV) ]" |
+                    yq "$ciKey.env_file |= . + [ env(SECRET_ENV) ]" | \
-                    yq "$agentKey = $agentTemplate" |
+                    yq "$agentKey = $agentTemplate" | \
-                    yq "$agentKey.depends_on |= . + [ env(CI_NAME) ]" |
+                    yq "$agentKey.depends_on |= . + [ env(CI_NAME) ]" | \
-                    yq "$agentKey.env_file |= . + [ env(SECRET_ENV) ]" |
+                    yq "$agentKey.env_file |= . + [ env(SECRET_ENV) ]" | \
-                    SERVER="$ciName:9000" yq "$agentEnv.WOODPECKER_SERVER = env(SERVER)" |
+                    SERVER="$ciName:9000" yq "$agentEnv.WOODPECKER_SERVER = env(SERVER)" | \
-                    yq "$dbKey = $dbTemplate" |
+                    yq "$dbKey = $dbTemplate" | \
-                    ENTRY="./data/$name/db:/var/lib/mysql" yq "$dbKey.volumes |= . + [ env(ENTRY) ]" |
+                    ENTRY="./data/$name/db:/var/lib/mysql" yq "$dbKey.volumes |= . + [ env(ENTRY) ]" | \
                     sudo tee "$config" >/dev/null
 
-                HOST="https://$domain" yq "$ciEnv.WOODPECKER_HOST = env(HOST)" "$tmpOverrides" |
+                HOST="https://$domain" yq "$ciEnv.WOODPECKER_HOST = env(HOST)" "$tmpOverrides" | \
-                    PORT="127.0.0.1:1337:8000" yq "$ciKey.ports = [ env(PORT) ]" |
+                    PORT="127.0.0.1:1337:8000" yq "$ciKey.ports = [ env(PORT) ]" | \
-                    DB="$dbUser:$pw@tcp($dbName:3306)/$db?parseTime=true" yq "$ciEnv.WOODPECKER_DATABASE_DATASOURCE = env(DB)" |
+                    DB="$dbUser:$pw@tcp($dbName:3306)/$db?parseTime=true" yq "$ciEnv.WOODPECKER_DATABASE_DATASOURCE = env(DB)" | \
-                    USER="$dbUser" yq "$dbEnv.MARIADB_USER = env(USER)" |
+                    USER="$dbUser" yq "$dbEnv.MARIADB_USER = env(USER)" | \
-                    PW="$pw" yq "$dbEnv.MARIADB_PASSWORD = env(PW)" |
+                    PW="$pw" yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \
-                    DB="$db" yq "$dbEnv.MARIADB_DATABASE = env(DB)" |
+                    DB="$db" yq "$dbEnv.MARIADB_DATABASE = env(DB)" | \
                     sudo tee "$overrides" >/dev/null
             end
         end
@@ -97,7 +97,7 @@ begin
 
         for i in (seq 1 3 (count $environments))
             set -l domain $environments[(math $i + 2)]
-            set -l subdomain $environments[(math $i + 1)]
+            set -l subdomain  $environments[(math $i + 1)]
             printf "%s\0" "$subdomain" "$domain"
         end
     end

scripts/Common/Software/linux/main.fish

@@ -5,6 +5,6 @@ begin
 
     function getUserBackupArgs
         argparse -i "user=" -- $argv
-        printf "%s\n" --base-directory ~"$_flag_user" --exact-depth 1 --hidden "^(\\.ssh|[^.])" --exclude Games --exclude Desktop ~ --exec fd . {}
+        printf "%s\n" --base-directory ~"$_flag_user" --exact-depth 1 --hidden "^(\\.ssh|[^.])" --exclude "Games" --exclude "Desktop" ~ --exec fd . {}
     end
 end

scripts/Common/Software/nuke-usb/nuke-usb.sh

@@ -11,7 +11,6 @@ sleep_secs="1"
 # * 'ehci-pci' - USB 2.0
 # * 'xhci_hcd' - USB 3.0
 echo "Looking for USB standards ..."
-
 for usb_std in "$base/"?hci[-_]?c*; do
     echo "* USB standard '$usb_std' ..."
 
@@ -26,5 +25,4 @@ for usb_std in "$base/"?hci[-_]?c*; do
 
     echo "  done."
 done
-
 echo "done."

scripts/Common/Software/powershell/Main.ps1

@@ -36,4 +36,4 @@ Start-SoftwareInstaller @args `
                     }).ToString()) -join "`n") `
                 -Append;
         }
-    };
+};

scripts/Windows/Drivers/Predator Z301C/Main.ps1

@@ -9,7 +9,7 @@ Start-SoftwareInstaller -Force @args `
         $null = Push-Location $dir;
         Invoke-WebRequest "https://global-download.acer.com/GDFiles/Driver/Monitor/Monitor_Acer_1.0_W7x86W7x64W8x86W8x64_A.zip?acerid=636092441703392074" -OutFile $file;
         Expand-Archive $file;
-        $null = Start-Process -Wait -FilePath "pnputil" -ArgumentList "/add-driver", "*.inf", "/install", "/subdirs";
+        $null = Start-Process -Wait -FilePath "pnputil" -ArgumentList "/add-driver","*.inf","/install","/subdirs";
         $null = Pop-Location;
 
         Remove-Item -Recurse $dir;

scripts/Windows/Software/tobii-gamehub/GameHub.ahk

@@ -1,24 +1,25 @@
-InstallGameHub() {
+InstallGameHub()
-    SetDefaultMouseSpeed(100)
+{
-    SetTitleMatchMode("RegEx")
+	SetDefaultMouseSpeed(100)
-    windowTitle := "^Tobii Game Hub$"
+	SetTitleMatchMode("RegEx")
+	windowTitle := "^Tobii Game Hub$"
 
-    Run("setup.exe")
+	Run("setup.exe")
-    WinWait(windowTitle, unset, 60)
+	WinWait(windowTitle, unset, 60)
-    WinActivate(windowTitle)
+	WinActivate(windowTitle)
-    Sleep(2 * 1000)
+	Sleep(2 * 1000)
-    MouseClick("Left", 485, 365)
+	MouseClick("Left", 485, 365)
-    MouseClick("Left", 600, 455)
+	MouseClick("Left", 600, 455)
-    MouseClick("Left", 533, 623)
+	MouseClick("Left", 533, 623)
-    MouseClick("Left", 936, 662)
+	MouseClick("Left", 936, 662)
-    Sleep(4 * 1000)
+	Sleep(4 * 1000)
-    WinActivate(windowTitle)
+	WinActivate(windowTitle)
-    MouseClick("Left", 1150, 60)
+	MouseClick("Left", 1150, 60)
-    MouseClick("Left", 518, 203)
+	MouseClick("Left", 518, 203)
-    Sleep(10 * 1000)
+	Sleep(10 * 1000)
-    WinActivate(windowTitle)
+	WinActivate(windowTitle)
-    pid := WinGetPID()
+	pid := WinGetPID()
-    Run("pwsh -c Stop-Process -Force " . pid)
+	Run("pwsh -c Stop-Process -Force " . pid)
 }
 
 SetWorkingDir(A_InitialWorkingDir)

scripts/Windows/Software/tobii-ghost/Ghost.ahk

@@ -1,21 +1,22 @@
-InstallGhost() {
+InstallGhost()
-    SetDefaultMouseSpeed(100)
+{
-    SetTitleMatchMode("RegEx")
+	SetDefaultMouseSpeed(100)
-    windowTitle := "^Tobii Ghost$"
+	SetTitleMatchMode("RegEx")
+	windowTitle := "^Tobii Ghost$"
 
-    Run("setup.exe")
+	Run("setup.exe")
-    WinWait(windowTitle, unset, 60)
+	WinWait(windowTitle, unset, 60)
-    WinActivate(windowTitle)
+	WinActivate(windowTitle)
-    MouseClick("Left", 44, 694)
+	MouseClick("Left", 44, 694)
-    MouseClick("Left", 330, 752)
+	MouseClick("Left", 330, 752)
-    WinWaitNotActive()
+	WinWaitNotActive()
-    WinWait(windowTitle, unset, 20)
+	WinWait(windowTitle, unset, 20)
-    MouseClick("Left", 563, 397)
+	MouseClick("Left", 563, 397)
-    MouseClick("Left", 650, 497)
+	MouseClick("Left", 650, 497)
-    Sleep(10 * 1000)
+	Sleep(10 * 1000)
-    WinActivate(windowTitle)
+	WinActivate(windowTitle)
-    pid := WinGetPID()
+	pid := WinGetPID()
-    Run("pwsh -c Stop-Process -Force " . pid)
+	Run("pwsh -c Stop-Process -Force " . pid)
 }
 
 SetWorkingDir(A_InitialWorkingDir)

scripts/Windows/Software/zoxide/Main.ps1

@@ -8,4 +8,4 @@ Start-SoftwareInstaller @args `
     -Installer {
         Install-ChocoPackage zoxide;
         Install-WingetPackage junegunn.fzf;
-    };
+    };

scripts/Windows/lib/Deployment.ps1

@@ -208,7 +208,7 @@ function Deploy-SoftwareAction {
                 Install-ChocoPackage teamspeak;
                 Remove-DesktopIcon "*TeamSpeak*";
             }
-            elseif ($userInstall) {
+            elseif  ($userInstall) {
                 Install-WingetPackage `
                     Element.Element `
                     OpenWhisperSystems.Signal `

scripts/lib/Settings.ps1

@@ -186,8 +186,7 @@ $null = New-Module {
         $programs = & {
             if ($User) {
                 return Get-UserConfig -UserName $User @args;
-            }
+            } else {
-            else {
                 return Get-OSConfig @args;
             }
         } "programs";
@@ -208,8 +207,7 @@ $null = New-Module {
 
         try {
             (Get-ProgramConfig @PSBoundParameters).enable;
-        }
+        } catch {
-        catch {
             $false;
         }
     }

scripts/lib/Software.ps1

@@ -90,7 +90,7 @@ $null = New-Module {
                     installer = $installHandler;
                     arguments = $Arguments;
                     context   = $Context;
-                    base      = { & $runBase @args };
+                    base = { & $runBase @args };
                 };
 
                 switch ($Action) {

scripts/lib/action.fish

@@ -27,7 +27,7 @@ function disposeAction -V dir
     source "$dir/nix.fish"
     runHook actionPostRun || true
     and uninstallNixPkgs
-    and sudo git config --remove-section --system safe || true
+    and sudo git config remove-section --system safe || true
 end
 
 function runAction -V dir
@@ -41,6 +41,7 @@ function runSetupUserAction -V dir
     source "$dir/settings.fish"
     runActionSetup
     runActionConfigure
+    set -l env "CONFIG_NAME=$CONFIG_NAME"
     set -l name (getOSConfig setupUser.name)
 
     if [ "$USER" != "$name" ]
@@ -50,7 +51,7 @@ function runSetupUserAction -V dir
             sudo --set-home --preserve-env env "PATH=$PATH" $cmdline
         else
             if [ -z "$TMUX" ]
-                tmux new-session env (env) $cmdline
+                tmux new-session -e "$env" $cmdline
             else
                 set -l sudoConfig "/etc/sudoers.d/PortValhalla"
 
@@ -58,12 +59,12 @@ function runSetupUserAction -V dir
                     echo "Creating setup user"
 
                     and useradd \
-                        --comment "PortValhalla Setup User" \
+                            --comment "PortValhalla Setup User" \
-                        --system \
+                            --system \
-                        --groups nix-users \
+                            --groups nix-users \
-                        --create-home \
+                            --create-home \
-                        --uid (getOSConfig setupUser.id --json) \
+                            --uid (getOSConfig setupUser.id --json) \
-                        "$name"
+                            "$name"
 
                     and begin
                         echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"

scripts/lib/nix.fish

@@ -1,7 +1,7 @@
 begin
     set -l dir (status dirname)
     set -l config "$dir/config.fish"
-    set nixPkgsDir /nix/var/nix/profiles/per-user/root/channels/nixpkgs
+    set nixPkgsDir "/nix/var/nix/profiles/per-user/root/channels/nixpkgs"
 
     function __isNixModule -a path
         nix-instantiate --eval --expr "{ path }: import path" --argstr path "$path" &>/dev/null

scripts/lib/restoration.fish

@@ -5,18 +5,18 @@ function backupFiles
         set -l path (getArchivePath $argv)
         set -l dir (dirname "$path")
         argparse -i "u/user=" "n/name=" -- $argv
-
+    
         if runRestorationCommand test ! -d "$dir"
             runRestorationCommand mkdir -p "$dir"
         end
-
+    
         if [ -n "$_flag_base_directory" ]
             set -a argv --base-directory "$_flag_base_directory"
             set -a tarArgs -C "$_flag_base_directory"
         else
             set -a tarArgs -P
         end
-
+    
         sudo tar $tarArgs -cvz (fd $argv) | createArchive "$path"
     end
 end

scripts/lib/software.fish

@@ -41,7 +41,7 @@ begin
                             argparse -i "$arg=" -- $args
                             set -l argv $backup
                         end
-
+    
                         if [ -z "$$varName" ]
                             argparse -i "$arg=" -- $argv
                             set -a args "--$arg" "$$varName"
@@ -109,12 +109,12 @@ begin
     end
 
     function runInstallerAction -V dir -V actions
-        argparse -i force "name=" "action=" -- $argv
+        argparse -i "force" "name=" "action=" -- $argv
         set -l install
         set -l name $_flag_name
         set -l action $_flag_action
         set -l args $_flag_force --name "$name"
-        set -l dependencyFunction installSWDependencies
+        set -l dependencyFunction "installSWDependencies"
         set -l installDependencies
         source "$dir/settings.fish"
 
@@ -149,8 +149,8 @@ begin
             if [ "$action" = "$actions[$i]" ]
                 set -l message
                 set -l function $actions[(math $i + 1)]
-                set -l preRun __preRun
+                set -l preRun "__preRun"
-                set -l postRun __postRun
+                set -l postRun "__postRun"
                 functions -e $preRun
                 functions -e $postRun
 

scripts/test/arch-install.fish

@@ -2,7 +2,7 @@
 set -l dir (status dirname)
 set -l container valhalla-test
 set -l containerDir "/var/lib/lxc/$container"
-set -l valhallaRoot opt/PortValhalla
+set -l valhallaRoot "opt/PortValhalla"
 sudo lxc-stop "$container"
 sudo lxc-destroy "$container"
 sudo lxc-create "$container" -t download -- --dist archlinux --release current --arch amd64
@@ -18,9 +18,9 @@ begin
         "lxc.mount.entry = $(realpath "$dir/../..") $valhallaRoot none bind 0 0" \
         "" \
         "# VPN" \
-        "lxc.cgroup.devices.allow = c 10:200 rwm" \
+        "lxc.cgroup.devices.allow = c 10:200 rwm"
         "lxc.mount.entry = /dev/net dev/net none bind,create=dir 0 0"
-end | sudo tee -a "$containerDir/config" >/dev/null
+end | sudo tee -a "$containerDir/config" > /dev/null
 
 sudo lxc-start "$container"
 

winiso/README.md

@@ -1,3 +1,3 @@
 # winiso-valhalla
 
-A project for generating a Windows installation medium.
+A project for generating a Windows installation medium.