Only ask for logout when applicable

.gitattributes

@@ -0,0 +1,2 @@
+*.fish  text eol=lf
+*.sh    text eol=lf

PortValhalla.code-workspace

@@ -10,6 +10,10 @@
         {
             "name": "archiso-valhalla",
             "path": "./archiso"
+        },
+        {
+            "name": "winiso-valhalla",
+            "path": "./winiso"
         }
     ]
 }

archiso/airootfs/root/.automated_script.sh

@@ -23,7 +23,7 @@ automated_script() {
                 sleep 1
             done
             printf '%s: downloading %s\n' "$0" "${script}"
-            curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script
+            curl "${script}" --location --retry-connrefused --retry 10 --fail -s -o /tmp/startup_script
             rt=$?
         else
             cp "${script}" /tmp/startup_script

archiso/airootfs/root/.config/nix/nix.conf

@@ -1 +0,0 @@
-extra-experimental-features = nix-command flakes

archiso/scripts/valhalla.patch

@@ -1,8 +1,8 @@
 diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
-index bf6bc8f..76e5893 100755
+index bf6bc8f..a0dae7b 100755
 --- a/airootfs/root/.zlogin
 +++ b/airootfs/root/.zlogin
-@@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
+@@ -4,3 +4,19 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
  fi
  
  ~/.automated_script.sh
@@ -16,13 +16,14 @@ index bf6bc8f..76e5893 100755
 +
 +git diff -p -R --no-ext-diff --no-color --diff-filter=M \
 +    | grep -E "^(diff|(old|new) mode)" --color=never  \
++    | sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" \
 +    | git apply
 +
 +popd > /dev/null
 +
 +loadkeys de_CH-latin1
 diff --git a/packages.x86_64 b/packages.x86_64
-index 9e876e7..b89ab30 100755
+index 9e876e7..c5db92a 100755
 --- a/packages.x86_64
 +++ b/packages.x86_64
 @@ -30,8 +30,10 @@ ethtool
@@ -36,7 +37,15 @@ index 9e876e7..b89ab30 100755
  gnu-netcat
  gpart
  gpm
-@@ -75,6 +77,7 @@ nbd
+@@ -45,6 +47,7 @@ irssi
+ iw
+ iwd
+ jfsutils
++jq
+ kitty-terminfo
+ ldns
+ less
+@@ -75,6 +78,7 @@ nbd
  ndisc6
  nfs-utils
  nilfs-utils

flake.nix

@@ -6,7 +6,7 @@
     flake-utils.url = "github:numtide/flake-utils?ref=b1d9ab70662946ef0850d488da1c9019f3a9752a";
   };
 
-  outputs = { self, flake-utils, nixpkgs }: flake-utils.lib.eachDefaultSystem (
+  outputs = { self, flake-utils, nixpkgs }: (flake-utils.lib.eachDefaultSystem (
       system:
         let
           pkgs = import nixpkgs {
@@ -32,5 +32,10 @@
           packages = {
             archiso = pkgs.archiso;
           };
-        });
+        })) // {
+    valhalla = {
+      DerGeret = import ./profiles/machines/manuel/DerGeret/Arch/config.nix;
+      ManuSurface = import ./profiles/machines/manuel/ManuSurface/Arch/config.nix;
+    };
+  };
 }

lib/eval-attribute.nix

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

lib/eval-module.nix

@@ -0,0 +1,16 @@
+let
+  inherit (nixpkgs) lib;
+  nixpkgs = import <nixpkgs> { config = {}; overlay = []; };
+  file = (builtins.getEnv "FILE");
+  property = (builtins.getEnv "PROPERTY");
+  processor = if (builtins.stringLength property > 0)
+    then
+      (_: lib.attrsets.getAttrFromPath (lib.strings.splitString "." property) _)
+    else
+      (_: _);
+in
+  processor (lib.evalModules {
+      modules = [
+        (import file)
+      ];
+    }).config

lib/modules/git.nix

@@ -1,41 +0,0 @@
-{ lib, ... }:
-  let
-    inherit (lib)
-      mkOption
-      types
-    ;
-
-    gitOptions = {
-      defaultBranch = mkOption {
-        type = types.nullOr types.str;
-        description = "The name of the default branch in git.";
-        default = null;
-      };
-
-      flow = {
-        mainBranch = mkOption {
-          type = types.nullOr types.str;
-          description = "The name of the stable branch in git flow.";
-          default = null;
-        };
-
-        devBranch = mkOption {
-          type = types.nullOr types.str;
-          description = "The name of the development branch in git flow.";
-          default = null;
-        };
-      };
-
-      aliases = mkOption {
-        type = types.attrsOf types.str;
-        description = "Git command aliases to install.";
-        default = {};
-      };
-    };
-  in {
-    options = {
-      valhalla = {
-        git = gitOptions;
-      };
-    };
-  }

lib/modules/hardware.nix

@@ -0,0 +1,55 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkOption
+      types
+    ;
+  in {
+    options = {
+      valhalla = {
+        hardware = {
+          components = mkOption {
+            type = types.listOf types.str;
+            description = "The names of the hardware components of the computer.";
+            default = [];
+          };
+
+          eyeX = mkOption {
+            type = types.bool;
+            description = "A value indicating whether a Tobii EyeX device is present.";
+            default = false;
+          };
+
+          amdCPU = mkOption {
+            type = types.bool;
+            description = "A value indicating whether an AMD CPU is present.";
+            default = false;
+          };
+
+          nvidiaGPU = mkOption {
+            type = types.bool;
+            description = "A value indicating whether an NVIDIA GPU is present.";
+            default = false;
+          };
+
+          corsairDevice = mkOption {
+            type = types.bool;
+            description = "A value indicating whether a Corsair device is present.";
+            default = false;
+          };
+
+          elgatoWave = mkOption {
+            type = types.bool;
+            description = "A value indicating whether an Elgato Wave device is present.";
+            default = false;
+          };
+
+          logitechG = mkOption {
+            type = types.bool;
+            description = "A value indicating whether a Logitech G device is present.";
+            default = false;
+          };
+        };
+      };
+    };
+  }

lib/modules/os.nix

@@ -0,0 +1,52 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkOption
+      types
+    ;
+  in {
+    options = {
+      valhalla = mkOption {
+        type = types.submodule (
+          { extendModules, ... }:
+            let
+              osVariant = extendModules {
+                modules = [
+                  ({ config, ... }: {
+                    options = {
+                      config = mkOption {
+                        type = types.attrs;
+                        description = "The configuration of the Operating System.";
+                        default = builtins.removeAttrs config ["_module" "config" "linux" "windows"];
+                        visible = false;
+                      };
+                    };
+                  })
+                ];
+              };
+
+              linuxVariant = osVariant.extendModules { };
+              windowsVariant = osVariant.extendModules { };
+            in {
+              options = {
+                linux = mkOption {
+                  inherit (linuxVariant) type;
+                  description = "The options for setting up Linux.";
+                  default = {};
+                  visible = "shallow";
+                };
+
+                windows = mkOption {
+                  inherit (windowsVariant) type;
+                  description = "The options for setting up Windows.";
+                  default = {};
+                  visible = "shallow";
+                };
+              };
+            });
+
+        description = "Configuration for PortValhalla.";
+        default = {};
+      };
+    };
+  }

lib/modules/packages/git.nix

@@ -0,0 +1,59 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkOption
+      types
+    ;
+
+    gitType = types.submodule (
+      { ... }: {
+        options = {
+          defaultBranch = mkOption {
+            type = types.nullOr types.str;
+            description = "The name of the default branch in newly created repositories.";
+            default = null;
+          };
+
+          flow = {
+            mainBranch = mkOption {
+              type = types.nullOr types.str;
+              description = "The name of the stable branch in git flow.";
+              default = null;
+            };
+
+            devBranch = mkOption {
+              type = types.nullOr types.str;
+              description = "The name of the development branch in git flow.";
+              default = null;
+            };
+          };
+
+          aliases = mkOption {
+            type = types.attrsOf types.str;
+            description = "The git command aliases to install.";
+            default = {};
+          };
+        };
+      });
+
+    gitOption = mkOption {
+      type = gitType;
+      description = "The git related options.";
+      default = {};
+    };
+  in {
+    options = {
+      valhalla = {
+        git = gitOption;
+
+        users = mkOption {
+          type = types.attrsOf (types.submodule (
+            { ... }: {
+              options = {
+                git = gitOption;
+              };
+            }));
+        };
+      };
+    };
+  }

lib/modules/packages/nextcloud.nix

@@ -0,0 +1,44 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkEnableOption
+      mkOption
+      types
+    ;
+
+    syncType = types.submodule (
+      { ... }: {
+        options = {
+          remotePath = mkOption {
+            type = types.str;
+            description = "The path to the folder on the cloud to sync.";
+          };
+
+          localPath = mkOption {
+            type = types.str;
+            description = "The path to sync the cloud content to.";
+          };
+
+          virtualFiles = (mkEnableOption "virtual file support") // {
+            default = true;
+          };
+        };
+      });
+  in {
+    options = {
+      valhalla.windows.users = mkOption {
+        type = types.attrsOf (types.submodule (
+          { ... }: {
+            options = {
+              nextcloud = {
+                folderSyncs = mkOption {
+                  type = types.listOf syncType;
+                  description = "The folders to synchronize.";
+                  default = [];
+                };
+              };
+            };
+          }));
+      };
+    };
+  }

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

@@ -0,0 +1,55 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkOption
+      types
+    ;
+
+    themeType = types.submodule (
+      { config, ... }: {
+        options = {
+          source = mkOption {
+            type = types.path;
+            description = "The path to the oh-my-posh theme to use.";
+          };
+
+          name = mkOption {
+            type = types.nullOr types.str;
+            description = "The name of the theme.";
+            default = lib.strings.removeSuffix ".omp" (lib.strings.removeSuffix ".json" (builtins.baseNameOf config.source));
+          };
+        };
+      });
+
+    ompType = types.submodule (
+      { config, ... }: {
+        options = {
+          theme = mkOption {
+            type = types.nullOr (types.either types.str themeType);
+            description = "The default theme.";
+            default = null;
+          };
+
+          additionalThemes = mkOption {
+            type = types.listOf themeType;
+            description = "A set of additional themes to install.";
+            default = [];
+          };
+        };
+      });
+  in {
+    options = {
+      valhalla.users = mkOption {
+        type = types.attrsOf (types.submodule (
+          { ... }: {
+            options = {
+              oh-my-posh = mkOption {
+                type = ompType;
+                description = "The Oh My Posh configuration to apply.";
+                default = {};
+              };
+            };
+          }));
+      };
+    };
+  }

lib/modules/packages/rclone.nix

@@ -0,0 +1,40 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkOption
+      types
+    ;
+
+    syncType = types.submodule (
+      { ... }: {
+        options = {
+          dirName = mkOption {
+            type = types.str;
+            description = "The name of the directory to sync the remote files to.";
+          };
+
+          cacheDuration = mkOption {
+            type = types.nullOr types.str;
+            description = "The amount of time to keep cached files.";
+            default = null;
+          };
+        };
+      });
+  in {
+    options = {
+      valhalla.linux.users = mkOption {
+        type = types.attrsOf (types.submodule (
+          { ... }: {
+            options = {
+              rclone = {
+                configurations = mkOption {
+                  type = types.attrsOf syncType;
+                  description = "The configurations of the rclone mounts.";
+                  default = {};
+                };
+              };
+            };
+          }));
+      };
+    };
+  }

lib/modules/partition/disks.nix

@@ -8,6 +8,7 @@
     fs = import ./fs.nix;
 
     diskListVarName = "myDisks";
+    probeScript = "partprobe 2> /dev/null || true";
     isSwap = partition: builtins.elem partition.type [fs.swap 19];
 
     mkDiskType = osDisk: types.submodule (
@@ -136,19 +137,12 @@
 
                   create = lib.strings.concatLines [
                     (appendScript "${toString index}: \"$(${sizeOption})\" type=${mkType type}")
-                    # Wait for partition to be detected
+                    probeScript
-                    ''echo "Waiting for ${partVar} to appear..."''
-                    ''
-                      while true;
-                      do
-                        [ -b ${partVar} ] && break;
-                      done;
-                    ''
                     "sudo ${formatScripts.${format}}"
                   ];
 
                   fallback = ''
-                    if ! { ls "${diskVar}"?(p)${toString index} 2>&1; } > /dev/null
+                    if ! { ls "${partVar}" 2>&1; } > /dev/null
                     then
                       ${create}
                     fi
@@ -329,21 +323,18 @@
               mountScript = lib.strings.concatLines (
                 builtins.concatMap
                   (_: [
-                  ''echo "Waiting for "${lib.strings.escapeShellArg (partPath _)}" to appear..."''
+                    probeScript
-                  ''
+                    (builtins.concatStringsSep " " ([
-                    while true;
-                    do
-                      [ -b ${lib.strings.escapeShellArg (partPath _)} ] && break
-                    done
-                  ''
-                    (builtins.concatStringsSep " " [
                       "sudo"
                       "mount"
                       "--mkdir"
+                    ] ++ (lib.optionals (_.format == "ntfs") [
+                      "-t" "ntfs3"
+                    ]) ++ [
                       (builtins.concatStringsSep " " (builtins.map (_: "-o ${_}") _.mountOptions))
                       (partPath _)
                       (normalizePath "/${rootDir}/${_.mountPoint}")
-                    ])
+                    ]))
                   ])
                   (lib.lists.sortOn
                     (_: normalizePath "/${_.mountPoint}")
@@ -351,13 +342,20 @@
 
               swapScript = lib.strings.concatLines (
                 builtins.map
-                  (_: "sudo swapon ${partPath _}")
+                  (_: ''
+                    ${probeScript}
+                    sudo swapon ${partPath _}
+                  '')
                   (builtins.filter (_: _.useSwap) partitions));
-            in lib.strings.concatLines (
+            in lib.strings.concatLines ([
-              (builtins.map (_: _.deviceScript) disks) ++ lib.optionals ((builtins.length disks) > 0) [
+                "#!/bin/bash"
+                "set -o errexit"
+              ] ++
+              (builtins.map (_: _.deviceScript) disks) ++
+              lib.optionals ((builtins.length disks) > 0) [
                 ". ${./../../../scripts/Common/Scripts/is-truthy.sh}"
                 ''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
-                (''echo "Continuing this script will wipe the contents of '' + (
+                (''echo "Continuing this script will alter the partitions of '' + (
                   lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
                 ) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'')
                 ''read -p "Are you sure you want to continue? [y/n] " answer''

lib/modules/software.nix

@@ -12,6 +12,7 @@
         software =
           let
             inherit (cfg.software)
+              coding
               common
               desktopExperience
               school
@@ -42,6 +43,12 @@
               default = common && !server;
             };
 
+            fileSync = mkOption {
+              type = types.bool;
+              description = "A value indicating whether file syncs should be installed.";
+              default = common && !server;
+            };
+
             school = mkOption {
               type = types.bool;
               description = "A value indicating whether software for studies should be installed.";
@@ -77,6 +84,12 @@
               description = "A value indicating whether development apps should be installed.";
               default = common;
             };
+
+            python = mkOption {
+              type = types.bool;
+              description = "A value indicating whether apps for coding python should be installed.";
+              default = coding;
+            };
           };
       };
     };

lib/modules/users.nix

@@ -0,0 +1,91 @@
+{ lib, ... }:
+  let
+    inherit (lib)
+      mkOption
+      types
+    ;
+
+    capitalize = (import ../text.nix { inherit lib; }).capitalize;
+
+    userType = types.submodule (
+      { ... } : {
+        options = {
+          displayName = mkOption {
+            type = types.nullOr types.str;
+            description = "The human-readable name of the user.";
+            default = null;
+          };
+
+          mailAddress = mkOption {
+            type = types.nullOr types.str;
+            description = "The mail address of the user.";
+            default = null;
+          };
+
+          groups = mkOption {
+            type = types.listOf types.str;
+            description = "The additional groups of the user.";
+            default = [];
+          };
+        };
+      });
+
+    linuxUserType = types.submodule (
+      { ... }: {
+        options = {
+          defaultShell = mkOption {
+            type = types.nullOr types.str;
+            description = "The default shell of the user.";
+            default = null;
+          };
+        };
+      });
+
+    winUserType = types.submodule (
+      { ... }: {
+        options = {
+          microsoftAccount = mkOption {
+            type = types.bool;
+            description = "A value indicating whether this user is a Microsoft Account.";
+            default = false;
+          };
+        };
+      });
+  in {
+    options = {
+      valhalla = {
+        users = mkOption {
+          type = types.attrsOf userType;
+          description = "The users to create on the machine.";
+          default = {};
+        };
+
+        linux.users = mkOption {
+          type = types.attrsOf linuxUserType;
+        };
+
+        windows = mkOption {
+          type = types.submoduleWith {
+            modules = [
+              ({ config, options, ... }: {
+                options = {
+                  users = mkOption {
+                    type = types.attrsOf winUserType;
+                  };
+
+                  winUsers = mkOption {
+                    type = options.users.type;
+                    description = "Blablabla";
+                    default = (lib.attrsets.concatMapAttrs (
+                      name: options: {
+                          ${capitalize name} = options;
+                        }) config.users);
+                  };
+                };
+              })
+            ];
+          };
+        };
+      };
+    };
+  }

lib/modules/valhalla.nix

@@ -6,10 +6,17 @@
     ;
   in {
     imports = [
-      ./git.nix
+      ./packages/git.nix
+      ./packages/nextcloud.nix
+      ./packages/oh-my-posh.nix
+      ./packages/rclone.nix
+      ./hardware.nix
       ./i18n.nix
+      ./os.nix
       ./partition.nix
       ./software.nix
+      ./users.nix
+      ./windows.nix
     ];
 
     options = {
@@ -28,6 +35,12 @@
           };
         };
 
+        hostname = mkOption {
+          type = types.str;
+          description = "The hostname of the system.";
+          default = "valhalla";
+        };
+
         setupUser = {
           name = mkOption {
             type = types.str;

lib/modules/windows.nix

@@ -0,0 +1,47 @@
+{ lib, config, ... }:
+  let
+    inherit (lib)
+      mkDefault
+      mkEnableOption
+      mkIf
+      mkOption
+      types
+    ;
+
+    capitalize = (import ../text.nix { inherit lib; }).capitalize;
+  in {
+    options = {
+      valhalla = {
+        windows = {
+          dualboot = {
+            enable = mkEnableOption "dual boot";
+
+            linuxPercentage = mkOption {
+              type = types.number;
+              description = "The percentage of the disk size reserved for Linux.";
+            };
+          };
+
+          showFileExt = mkOption {
+            type = types.bool;
+            description = "A value indicating whether file extensions should be displayed in Windows Explorer.";
+            default = true;
+          };
+
+          legacyIconSpacing = mkEnableOption "legacy icon spacing" // {
+            default = true;
+          };
+
+          dynamicLighting = mkEnableOption "dynamic lighting";
+          adware = mkEnableOption "adware"; # Fuck you for displaying ads on an OS I fricking paid for!
+        };
+      };
+    };
+
+    config = {
+      valhalla.windows = {
+        setupUser.name = mkDefault (capitalize config.valhalla.setupUser.name);
+        dualboot.linuxPercentage = mkIf (!config.valhalla.windows.dualboot.enable) (mkDefault 0);
+      };
+    };
+  }

lib/text.nix

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

profiles/DerGeret/Arch/install.sh

@@ -1,19 +0,0 @@
-#!/bin/bash -e
-function install() {
-    function installDrivers() {
-        . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-        . "../../../scripts/Arch/Software/nvidia-dkms/install.sh";
-        . "../../../scripts/Arch/Software/xone/install.sh";
-        . "../../../scripts/Arch/Software/bt-dualboot/install.sh";
-    }
-
-    function initializeConfig() {
-        . "../../../scripts/Unix/Devices/Logitech G903/install.sh";
-    }
-
-    pushd "$dir" > /dev/null;
-    . "../../../scripts/Arch/OS/install.sh";
-    popd > /dev/null;
-}
-
-install;

profiles/DerGeret/Windows/Setup.ps1

@@ -1,139 +0,0 @@
-#!/bin/pwsh
-$env:WIN_COMPUTER_NAME = "DerGeret";
-$env:SETUP_SCRIPT_NAME = "$PSScriptRoot/Restore.ps1";
-
-function Initialize-SetupConfig() {
-    param(
-        [xml] $config,
-        [System.Xml.XmlNamespaceManager] $namespace
-    );
-
-    $setupComponent = $config.SelectSingleNode(
-        "/ua:unattend/ua:settings[@pass='windowsPE']/ua:component[@name='Microsoft-Windows-Setup']",
-        $namespace);
-
-    $diskConfig = $setupComponent.SelectSingleNode("./ua:DiskConfiguration/ua:Disk", $namespace);
-
-    $partitionCreationContainer = $diskConfig.SelectSingleNode("./ua:CreatePartitions", $namespace);
-    $partitionCreations = $partitionCreationContainer.SelectNodes("./ua:CreatePartition", $namespace);
-
-    $partitionModificationContainer = $diskConfig.SelectSingleNode("./ua:ModifyPartitions", $namespace);
-    $partitionModifications = $partitionModificationContainer.SelectNodes("./ua:ModifyPartition", $namespace);
-
-    <#
-    .SYNOPSIS
-        Gets the XML element describing the installation partition ID.
-    #>
-    function Get-InstallationPartition {
-        $setupComponent.SelectSingleNode("./ua:ImageInstall/ua:OSImage/ua:InstallTo/ua:PartitionID", $namespace)
-    }
-
-    <#
-    .SYNOPSIS
-        Increases the ID of all partitions in the specified range by 1.
-    #>
-    function Move-PartitionRange {
-        param (
-            [int]$From = 0,
-            [System.Nullable[int]]$To = $null,
-            [int]$By = 1
-        )
-
-        # Update installation partition ID if necessary
-        $installationPartition = Get-InstallationPartition;
-        $installPartitionID = [int]$installationPartition.InnerText;
-
-        if (($installPartitionID -ge $From) -and (($null -eq $To) -or ($installPartitionID -le $To))) {
-            $installationPartition.InnerText = "$($installPartitionID + $By)";
-        }
-
-        # Update IDs of all partition creations
-        foreach ($partition in $partitionCreations) {
-            $orderNode = $partition.SelectSingleNode("./ua:Order", $namespace);
-            $order = [int]$orderNode.InnerText;
-            $newOrder = $order;
-
-            if (($newOrder -ge $From) -and (($null -eq $To) -or ($newOrder -le $To))) {
-                $newOrder += $By;
-            }
-
-            if ($order -ne $newOrder) {
-                $orderNode.InnerText = "$newOrder";
-            }
-        }
-
-        # Update IDs of all partition modifications
-        foreach ($partition in $partitionModifications) {
-            $partitionNode = $partition.SelectSingleNode("./ua:PartitionID", $namespace);
-            $partitionID = [int]$partitionNode.InnerText;
-            $newID = $partitionID;
-
-            if (($newID -ge $From) -and (($null -eq $To) -or ($newID -le $To))) {
-                $newID += $By;
-            }
-
-            if ($partitionID -ne $newID) {
-                $partitionNode.InnerText = "$newID";
-                $partition.SelectSingleNode("./ua:Order", $namespace).InnerText = "$newID";
-            }
-        }
-    }
-
-    function Add-Partition {
-        param (
-            [int]$Index,
-            [int]$Size,
-            [string]$Type = "Primary"
-        )
-
-        Move-PartitionRange -From $Index -By 1;
-
-        $newPartition = $partitionCreations[0].CloneNode($true);
-        $newPartition.SelectSingleNode("./ua:Order", $namespace).InnerText = "$Index";
-        $newPartition.SelectSingleNode("./ua:Type", $namespace).InnerText = "$Type";
-        $newPartition.SelectSingleNode("./ua:Size", $namespace).InnerText = "$Size";
-        $null = $partitionCreationContainer.AppendChild($newPartition);
-
-        $newModification = $partitionModifications[2].CloneNode($true);
-        $newModification.SelectSingleNode("./ua:Order", $namespace).InnerText = "$Index";
-        $newModification.SelectSingleNode("./ua:PartitionID", $namespace).InnerText = "$Index";
-        $null = $partitionModificationContainer.AppendChild($newModification);
-    }
-
-    <#
-    .SYNOPSIS
-        Relocates the partition with the specified `$From` ID to the specified `$To` ID.
-    #>
-    function Invoke-PartitionRelocation {
-        param (
-            [int]$From,
-            [int]$To
-        )
-
-        Move-PartitionRange $From $From (-1 * ($From + 1))
-
-        if ($From -gt $To) {
-            Move-PartitionRange $To ($From - 1);
-        }
-        elseif ($From -lt $To) {
-            Move-PartitionRange ($From + 1) $To -1;
-        }
-
-        Move-PartitionRange -1 -1 ($To + 1)
-    }
-
-    # Resize EFI partition to 1GB
-    $partitionCreations[1].SelectSingleNode("./ua:Size", $namespace).InnerText = "$(1024)";
-
-    # Swap Windows RE partition (partition #1)  and boot partition (partition #2)
-    Invoke-PartitionRelocation 2 1;
-
-    # Add space before Windows installation... wha-!? For Linux, ofc! I use Arch Linux, btw.
-    $swapSpacer = 100;
-    Add-Partition 2 $swapSpacer;
-
-    # Add a 1.2 TB partition for Linux
-    Add-Partition 3 ((1.2 * 1024 * 1024) - 1024 - $swapSpacer);
-}
-
-. "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1";

profiles/DerGeret/config.nix

@@ -1,21 +0,0 @@
-{ ... }: {
-  imports = [
-    ../Generic/config.nix
-  ];
-
-  config =  {
-    valhalla.partition.os.partitions = {
-      Boot.keepExisting = true;
-
-      Windows = {
-        index = 6;
-        label = "OS";
-        format = "ntfs";
-        size = "+600G";
-        mountPoint = "/win";
-        mountOptions = ["force"];
-        keepExisting = true;
-      };
-    };
-  };
-}

profiles/Generic/Windows/Install.ps1

@@ -1,13 +0,0 @@
-#!/bin/pwsh
-. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/OS/Install.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/Collections/Generic.ps1"
-
-function Restore-Apps {
-    param([Context] $context)
-    Restore-GenericApps $context;
-}
-
-[Context]$context = [Context]::new();
-Invoke-WindowsInstallation $context;
-Restart-Computer -Force;

profiles/Generic/Windows/Setup.ps1

@@ -1,5 +0,0 @@
-#!/bin/pwsh
-$env:WIN_COMPUTER_NAME ??= "win11";
-$env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
-
-. "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1";

profiles/KVM/Windows/Setup.ps1

@@ -1,4 +0,0 @@
-#!/bin/pwsh
-$env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
-
-. "$PSScriptRoot/../../Generic/Windows/Setup.ps1";

profiles/ManuSurface/Arch/install.fish

@@ -1,5 +0,0 @@
-#!/bin/env fish
-begin
-    set -l dir (status dirname)
-    source "$dir/../../../scripts/Arch/OS/install.fish"
-end

profiles/ManuSurface/Arch/install.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -e
-function install() {
-    function installDrivers() {
-        . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-        . "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
-    }
-
-    function installSoftware() {
-        . "../../../scripts/Arch/Collections/school.sh";
-    }
-
-    function initializeConfig() {
-        . "../../../scripts/Common/Config/Steam/hidpi.sh";
-        . "../../../scripts/Unix/Devices/Surface Book 2/install.sh";
-        . "../../../scripts/Unix/Devices/Logitech G903/install.sh";
-
-        # Because, as it looks, Surface Books are fucking stupid.
-        . "../../../scripts/Common/Config/GRUB/verbose.sh";
-    }
-
-    pushd "${BASH_SOURCE%/*}" > /dev/null;
-    . "../../../scripts/Arch/OS/install.sh";
-    popd > /dev/null;
-}
-
-install;

profiles/ManuSurface/PopOS/setup.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
-# Set Hostname
-sudo hostnamectl set-hostname ManuSurface;
-
-source "../../../scripts/PopOS/Scripts/preinstall.sh";
-source "../../../scripts/PopOS/OS/install.sh";
-source "../../../scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh";
-source "../../../scripts/PopOS/Software/Collections/school.sh";
-INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../scripts/Common/Config/UserProfile/install.sh";
-
-# Install equalizer
-source "../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
-
-source "../../../scripts/PopOS/Scripts/postinstall.sh";
-popd > /dev/null;

profiles/ManuSurface/config.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-  imports = [
-    ../Generic/Arch/config.nix
-  ];
-
-  config = {
-    valhalla.partition.os.deviceName = "nvme0n1";
-  };
-}

profiles/PopOSLive/setup.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
-
-# Set Hostname
-sudo hostnamectl set-hostname ManuPopOSLive;
-source "../../scripts/PopOS/Scripts/prepare.sh";
-source "../../scripts/PopOS/OS/install.sh";
-source "../../scripts/PopOS/Software/Collections/personal.sh";
-INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../scripts/Common/Config/UserProfile/personal.sh";
-
-source "../../scripts/PopOS/Scripts/postinstall.sh";
-popd > /dev/null;

profiles/machines/manuel/DerGeret/Arch/install.fish

@@ -0,0 +1,4 @@
+#!/bin/env fish
+begin
+    bash "$(status dirname)/install.sh"
+end

profiles/machines/manuel/DerGeret/Arch/install.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -e
+function install() {
+    function installDrivers() {
+        . "../../../../../scripts/Arch/Config/SecureBoot/install.sh";
+        . "../../../../../scripts/Arch/Software/nvidia-dkms/install.sh";
+        . "../../../../../scripts/Arch/Software/xone/install.sh";
+        . "../../../../../scripts/Arch/Software/bt-dualboot/install.sh";
+    }
+
+    function initializeConfig() {
+        . "../../../../../scripts/Unix/Devices/Logitech G903/install.sh";
+    }
+
+    pushd "$dir" > /dev/null;
+    . "../../../../../scripts/Arch/OS/install.sh";
+    popd > /dev/null;
+}
+
+install;

profiles/machines/manuel/DerGeret/Arch/setup.fish

@@ -0,0 +1,9 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+
+    CONFIG_NAME="DerGeret" \
+    ARCH_HOSTNAME="der-geret" \
+    USER_DISPLAYNAME="Manuel Thalmann" \
+        source "$(status dirname)/../../../../../scripts/Arch/OS/setup.fish"
+end

profiles/machines/manuel/DerGeret/Arch/setup.sh

@@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 CONFIG_MODULE="./config.nix" \
 ARCH_HOSTNAME="der-geret" \
 USER_DISPLAYNAME="Manuel Thalmann" \
-    . "../../../scripts/Arch/OS/setup.sh";
+    . "../../../../../scripts/Arch/OS/setup.sh";
 
 popd > /dev/null;

profiles/machines/manuel/DerGeret/Windows/Backup.ps1

@@ -1,7 +1,7 @@
 #!/bin/pwsh
 $null = New-Module {
-    . "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
+    . "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
-    . "$PSScriptRoot/../../../scripts/Windows/OS/Manage.ps1";
+    . "$PSScriptRoot/../../../../../scripts/Windows/OS/Legacy.ps1";
 
     Write-Host "Starting Backup of Windows";
     $context = [Context]::new();

profiles/machines/manuel/DerGeret/Windows/Drivers.ps1

@@ -1,12 +1,12 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
 
 function Install-PortValhallaDrivers {
     param(
         [Context] $context
     )
 
-    $winPath = "$PSScriptRoot/../../../scripts/Windows";
+    $winPath = "$PSScriptRoot/../../../../../scripts/Windows";
     $driverPath = "$winPath/Drivers";
     $mbDriverPath = "$driverPath/ROG Zenith Extreme Alpha";
     $context.RegisterReboot();
@@ -38,7 +38,7 @@ function Install-PersonalDrivers {
         [Context] $context
     )
 
-    $softwarePath = "$PSScriptRoot/../../../scripts/Windows/Software";
+    $softwarePath = "$PSScriptRoot/../../../../../scripts/Windows/Software";
     . "$softwarePath/TobiiGhost/Install.ps1" $context;
     . "$softwarePath/TobiiGameHub/Install.ps1" $context;
 }

profiles/machines/manuel/DerGeret/Windows/Restore.ps1

@@ -1,8 +1,8 @@
 #!/bin/pwsh
 . "$PSScriptRoot/Drivers.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/Collections/Personal.ps1"
+. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/OS/Install.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/Collections/Personal.ps1"
-. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Manage.ps1";
 
 function Initialize-Configuration {
     # Fix synchronization between Linux and Windows clock
@@ -26,5 +26,4 @@ function Restore-Apps {
 
 Write-Host "Starting Restoration of Windows";
 [Context]$context = [Context]::new();
-Invoke-WindowsInstallation $context;
+Start-WindowsInstallation;
-Restart-Computer -Force;

profiles/machines/manuel/DerGeret/Windows/Setup.ps1

@@ -0,0 +1,5 @@
+#!/bin/pwsh
+$env:WIN_COMPUTER_NAME = "DerGeret";
+$env:CONFIG_NAME = $env:WIN_COMPUTER_NAME;
+
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Setup.ps1";

profiles/machines/manuel/DerGeret/config.nix

@@ -0,0 +1,52 @@
+{ lib, ... }: {
+  imports = [
+    ../defaults.nix
+  ];
+
+  config = {
+    valhalla = {
+      hostname = lib.mkDefault "der-geret";
+
+      windows = {
+        dualboot = {
+          enable = true;
+          linuxPercentage = 70; # better safe than sorry
+        };
+
+        hostname = "DerGeret";
+
+        users.manuel = {
+          microsoftAccount = true;
+          groups = ["Administrators"];
+        };
+      };
+
+      partition.os.partitions = {
+        Boot.keepExisting = true;
+
+        Windows = {
+          index = 6;
+          label = "OS";
+          format = "ntfs";
+          mountPoint = "/win";
+          mountOptions = ["force"];
+          keepExisting = true;
+        };
+      };
+
+      hardware = {
+        components = [
+          "ROG Zenith Extreme Alpha"
+          "Predator Z301C"
+        ];
+
+        eyeX = true;
+        amdCPU = true;
+        nvidiaGPU = true;
+        logitechG = true;
+        corsairDevice = true;
+        elgatoWave = true;
+      };
+    };
+  };
+}

profiles/machines/manuel/Generic/Arch/install.sh

@@ -3,11 +3,11 @@ function install() {
     local dir="$(realpath "${BASH_SOURCE%/*}")";
 
     function installDrivers() {
-        . "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
+        . "$dir/../../../../../scripts/Arch/Config/SecureBoot/install.sh";
     }
 
 
-    . "../../../scripts/Arch/OS/install.sh";
+    . "../../../../../scripts/Arch/OS/install.sh";
 }
 
 install;

profiles/machines/manuel/Generic/Arch/setup.sh

@@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 ARCH_MOUNT_ROOT="/mnt" \
 ARCH_HOSTNAME="archlinux" \
 USER_DISPLAYNAME="Manuel Thalmann" \
-    . "../../../scripts/Arch/OS/setup.sh";
+    . "../../../../../scripts/Arch/OS/setup.sh";
 
 popd > /dev/null;

profiles/machines/manuel/Generic/Windows/Install.ps1

@@ -0,0 +1,13 @@
+#!/bin/pwsh
+. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Manage.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/Collections/Generic.ps1"
+
+function Restore-Apps {
+    param([Context] $context)
+    Restore-GenericApps $context;
+}
+
+[Context]$context = [Context]::new();
+Invoke-WindowsInstallation $context;
+Restart-Computer -Force;

profiles/machines/manuel/Generic/Windows/Setup.ps1

@@ -0,0 +1,5 @@
+#!/bin/pwsh
+$env:WIN_COMPUTER_NAME ??= "win11";
+$env:CONFIG_MODULE ??= "$PSScriptRoot/../config.nix";
+
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Setup.ps1";

profiles/machines/manuel/Generic/config.nix

@@ -1,9 +1,9 @@
 { lib, config, ... }:
   let
-    fs = import ../../lib/modules/partition/fs.nix;
+    fs = import ../../../../lib/modules/partition/fs.nix;
   in {
     imports = [
-      ../../lib/modules/valhalla.nix
+      ../defaults.nix
     ];
 
     config = {

profiles/machines/manuel/KVM/Windows/Install.ps1

@@ -14,4 +14,4 @@ function Install-PortValhallaDrivers {
     choco install -y spice-agent;
 }
 
-. "$PSScriptRoot/../../Generic/Windows/Install.ps1";
+. "$PSScriptRoot/../../../../Generic/Windows/Install.ps1";

profiles/machines/manuel/KVM/Windows/Setup.ps1

@@ -0,0 +1,2 @@
+#!/bin/pwsh
+. "$PSScriptRoot/../../../../Generic/Windows/Setup.ps1";

profiles/machines/manuel/ManuSurface/Arch/install.fish

@@ -0,0 +1,5 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../../../../scripts/Arch/OS/install.fish"
+end

profiles/machines/manuel/ManuSurface/Arch/install.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -e
+function install() {
+    function installDrivers() {
+        . "../../../../../scripts/Arch/Config/SecureBoot/install.sh";
+        . "../../../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
+    }
+
+    function installSoftware() {
+        . "../../../../../scripts/Arch/Collections/school.sh";
+    }
+
+    function initializeConfig() {
+        . "../../../../../scripts/Common/Config/Steam/hidpi.sh";
+        . "../../../../../scripts/Unix/Devices/Surface Book 2/install.sh";
+        . "../../../../../scripts/Unix/Devices/Logitech G903/install.sh";
+
+        # Because, as it looks, Surface Books are fucking stupid.
+        . "../../../../../scripts/Common/Config/GRUB/verbose.sh";
+    }
+
+    pushd "${BASH_SOURCE%/*}" > /dev/null;
+    . "../../../../../scripts/Arch/OS/install.sh";
+    popd > /dev/null;
+}
+
+install;

profiles/machines/manuel/ManuSurface/Arch/setup.fish

@@ -3,7 +3,7 @@ begin
     set -l dir (status dirname)
 
     function installDrivers -V dir -S
-        source "$dir/../../../scripts/Common/Scripts/config.fish"
+        source "$dir/../../../../../scripts/Common/Scripts/config.fish"
         pacstrap -K (getConfig valhalla.partition.rootDir) linux-firmware-marvell;
     end
 
@@ -11,8 +11,8 @@ begin
         echo "$dir/install.fish"
     end
 
-    CONFIG_MODULE="$(status dirname)/config.nix" \
+    CONFIG_NAME="ManuSurface" \
     ARCH_HOSTNAME="manu-surface" \
     USER_DISPLAYNAME="Manuel Thalmann" \
-        source "$(status dirname)/../../../scripts/Arch/OS/setup.fish";
+        source "$(status dirname)/../../../../../scripts/Arch/OS/setup.fish";
 end

profiles/machines/manuel/ManuSurface/PopOS/setup.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+pushd "${BASH_SOURCE%/*}" > /dev/null;
+# Set Hostname
+sudo hostnamectl set-hostname ManuSurface;
+
+source "../../../../../scripts/PopOS/Scripts/preinstall.sh";
+source "../../../../../scripts/PopOS/OS/install.sh";
+source "../../../../../scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh";
+source "../../../../../scripts/PopOS/Software/Collections/school.sh";
+INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../../../scripts/Common/Config/UserProfile/install.sh";
+
+# Install equalizer
+source "../../../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
+
+source "../../../../../scripts/PopOS/Scripts/postinstall.sh";
+popd > /dev/null;

profiles/machines/manuel/ManuSurface/config.nix

@@ -0,0 +1,12 @@
+{ ... }: {
+  imports = [
+    ../Generic/Arch/config.nix
+  ];
+
+  config = {
+    valhalla = {
+      hostname = "manu-surface";
+      partition.os.deviceName = "nvme0n1";
+    };
+  };
+}

profiles/machines/manuel/PopOSLive/setup.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+pushd "${BASH_SOURCE%/*}" > /dev/null;
+
+# Set Hostname
+sudo hostnamectl set-hostname ManuPopOSLive;
+source "../../../../scripts/PopOS/Scripts/prepare.sh";
+source "../../../../scripts/PopOS/OS/install.sh";
+source "../../../../scripts/PopOS/Software/Collections/personal.sh";
+INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../../scripts/Common/Config/UserProfile/personal.sh";
+
+source "../../../../scripts/PopOS/Scripts/postinstall.sh";
+popd > /dev/null;

profiles/machines/manuel/defaults.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ../../users/manuel/config.nix
+    ../../../lib/modules/valhalla.nix
+  ];
+}

profiles/users/manuel/config.nix

@@ -0,0 +1,66 @@
+{ ... }: {
+  imports = [
+    ../../../lib/modules/valhalla.nix
+  ];
+
+  config = {
+    valhalla = {
+      users.manuel = {
+        displayName = "Manuel Thalmann";
+        mailAddress = "m@nuth.ch";
+
+        oh-my-posh = {
+          theme = {
+            source = ./manuel.omp.json;
+          };
+        };
+      };
+
+      linux.users.manuel = {
+        defaultShell = "fish";
+
+        groups = [
+          "wheel"
+          "nix-users"
+        ];
+
+        rclone = {
+          configurations = {
+            nextcloud = {
+              dirName = "Nextcloud";
+            };
+            proton = {
+              dirName = "Proton";
+            };
+          };
+        };
+      };
+
+      windows.users.manuel = {
+        nextcloud = {
+          folderSyncs =
+            let
+              localPath = "C:/tools/RetroArch-Win64";
+              remotePath = "/Saved Games/RetroArch";
+            in [
+              {
+                remotePath = "${remotePath}/Saves";
+                localPath = "${localPath}/saves";
+                virtualFiles = false;
+              }
+              {
+                remotePath = "${remotePath}/System";
+                localPath = "${localPath}/system";
+              }
+            ];
+        };
+      };
+
+      partition = {
+        os = {
+          partitions = { };
+        };
+      };
+    };
+  };
+}

profiles/users/manuel/manuel.omp.json

@@ -0,0 +1,173 @@
+{
+    "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+    "version": 2,
+    "blocks": [
+        {
+            "type": "prompt",
+            "alignment": "left",
+            "segments": [
+                {
+                    "type": "os",
+                    "style": "diamond",
+                    "leading_diamond": "\ue0b6",
+                    "trailing_diamond": "\ue0b4",
+                    "background_templates": [
+                        "{{ if eq .OS \"ubuntu\" }}#EA531A{{ end }}",
+                        "{{ if eq .OS \"debian\" }}#D80150{{ end }}",
+                        "{{ if eq .OS \"arch\" }}#1793D1{{ end }}"
+                    ],
+                    "foreground": "p:white",
+                    "template": "{{ if ne .OS \"windows\" }}{{ .Icon }} {{ end }}"
+                },
+                {
+                    "type": "session",
+                    "style": "diamond",
+                    "leading_diamond": "\ue0b6",
+                    "trailing_diamond": "\ue0b0",
+                    "background": "p:yellow",
+                    "foreground": "p:black",
+                    "properties": {
+                        "display_host": false
+                    },
+                    "template": "{{ if .SSHSession }}\ueb39{{ end }} {{ .UserName }} "
+                },
+                {
+                    "type": "path",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "background": "p:orange",
+                    "foreground": "p:black",
+                    "properties": {
+                        "home_icon": "~",
+                        "style": "folder"
+                    },
+                    "template": " \udb80\ude4b {{ path .Path .Location }} "
+                },
+                {
+                    "type": "dotnet",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "foreground": "p:black",
+                    "background": "#00ffff",
+                    "template": " \udb81\ude10 {{ .Full }} "
+                },
+                {
+                    "type": "java",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "background": "#4063d8",
+                    "template": " \udb82\udf37 {{ .Full }} "
+                },
+                {
+                    "type": "python",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "background": "#906cff",
+                    "template": " \udb80\udf20 {{ .Full }} "
+                },
+                {
+                    "type": "git",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "trailing_diamond": "\ue0b4",
+                    "background": "p:green",
+                    "background_templates": [
+                        "{{ if or (.Working.Changed) (.Staging.Changed) }}p:yellow{{ end }}",
+                        "{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:red{{ end }}",
+                        "{{ if gt .Ahead 0 }}#49416D{{ end }}",
+                        "{{ if gt .Behind 0 }}#7A306C{{ end }}"
+                    ],
+                    "foreground": "p:black",
+                    "foreground_templates": [
+                        "{{ if or (.Working.Changed) (.Staging.Changed) }}p:black{{ end }}",
+                        "{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:white{{ end }}",
+                        "{{ if gt .Ahead 0 }}p:white{{ end }}"
+                    ],
+                    "properties": {
+                        "branch_max_length": 25,
+                        "fetch_stash_count": true,
+                        "fetch_status": true,
+                        "fetch_upstream_icon": true,
+                        "upstream_icons": {
+                            "codeberg.org": "\uf330 ",
+                            "git.nuth.ch": "\uf335",
+                            "git.jonascosta.ch": "\uf339 ",
+                            "git.romhackersworld.eu": "\uf339 ",
+                            "aur.archlinux.org": "\uf303 "
+                        }
+                    },
+                    "templates": [
+                        "{{ if .UpstreamURL }} {{ url .UpstreamIcon .UpstreamURL }}{{ end }}",
+                        " {{ .HEAD }} ",
+                        "{{ if .BranchStatus }}{{ .BranchStatus }} {{ end }}",
+                        "{{ if .Working.Changed }} \uf044 {{ .Working.String }} {{ end }}",
+                        "{{ if and (.Working.Changed) (or (.Staging.Changed) (gt .StashCount 0)) }} | {{ end }}",
+                        "{{ if .Staging.Changed }} \uf046 {{ .Staging.String }} {{ end }}",
+                        "{{ if and (.Staging.Changed) (gt .StashCount 0) }} | {{ end }}",
+                        "{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} "
+                    ]
+                },
+                {
+                    "type": "node",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "background": "#6ca35e",
+                    "foreground": "p:white",
+                    "properties": {
+                        "fetch_version": true
+                    },
+                    "template": " \udb80\udf99 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} "
+                },
+                {
+                    "type": "root",
+                    "style": "powerline",
+                    "powerline_symbol": "\ue0b0",
+                    "background": "p:yellow",
+                    "foreground": "p:white",
+                    "properties": {
+                        "root_icon": "\uf0e7"
+                    }
+                },
+                {
+                    "type": "executiontime",
+                    "style": "plain",
+                    "background": "#83769c",
+                    "foreground": "p:white",
+                    "properties": {
+                        "always_enabled": true
+                    },
+                    "template": "<transparent>\ue0b0</> \udb81\udead {{ .FormattedMs }}\u2800"
+                },
+                {
+                    "type": "text",
+                    "style": "diamond",
+                    "background": "p:blue",
+                    "trailing_diamond": "\ue0b4",
+                    "background_templates": [
+                        "{{ if gt .Code 0 }}p:red{{ end }}"
+                    ],
+                    "foreground": "p:white",
+                    "properties": {
+                        "always_enabled": true
+                    },
+                    "template": "<parentBackground>\ue0b0</> {{ if gt .Code 0 }}\uf00d{{ else }}\uf00c{{ end }} "
+                }
+            ]
+        }
+    ],
+    "transient_prompt": {
+        "background": "transparent",
+        "foreground": "p:black",
+        "template": "<p:yellow,transparent>\ue0b6</><,p:yellow> {{ .Folder }} </><p:yellow,transparent>\ue0b0</> "
+    },
+    "final_space": true,
+    "palette": {
+        "black": "#262B44",
+        "blue": "#4B95E9",
+        "green": "#59C9A5",
+        "orange": "#F07623",
+        "red": "#D81E5B",
+        "white": "#E0DEF4",
+        "yellow": "#F3AE35"
+    }
+}

scripts/Arch/Collections/personal.sh

@@ -109,7 +109,7 @@ yay --noconfirm -Syu jq;
 BROWSER_BIN="brave" \
 EXTENSION_DIR="/usr/share/chromium-extensions" \
 EXTENSION_POLICY_DIR="$braveExtensions" \
-    source "../../Common/Config/Chromium/install-ytmusic-dl.sh";
+    source "../../Common/Software/Chromium/ytmdl.sh";
 
 # sudo ln -sf "$braveExtensions" /opt/brave.com/brave-beta/extensions;
 # sudo ln -sf "$braveExtensions" /opt/brave.com/brave-nightly/extensions;

scripts/Arch/OS/install.fish

@@ -2,96 +2,27 @@
 begin
     set -l dir (status dirname)
 
+    function getDeploymentScript -V dir
+        echo "$dir/../Scripts/deploy.fish";
+    end
+
     function initialize -V dir
         source "$dir/../../Common/Scripts/wait-network.fish"
         waitNetwork
         or exit
 
         sudo systemctl enable --now nix-daemon
-        source "$dir/../Scripts/software.fish"
+        and source "$dir/../Scripts/software.fish"
-        source "$dir/../Software/base-devel/main.fish"
+        and source "$dir/../Software/base-devel/main.fish"
-        source "$dir/../Software/pacman/main.fish"
+        and source "$dir/../Software/pacman/main.fish"
-        source "$dir/../Software/yay/main.fish"
+        and source "$dir/../Software/yay/main.fish"
 
-        yayinst \
+        and source "$dir/../Software/PowerShell/main.fish"
+
+        and yayinst \
+            linux-headers \
             pacman-contrib \
-            powershell-bin
+            yq
-    end
-
-    if not type -q installSoftware
-        function installSoftware -V dir
-            source "$dir/../../Common/Scripts/config.fish"
-            source "$dir/../Scripts/software.fish"
-
-            if collectionActive essential
-                yayinst \
-                    mkinitcpio-firmware \
-                    neofetch \
-                    bash-completion \
-                    wget \
-                    oh-my-posh-bin \
-                    screen \
-                    tmux \
-                    htop \
-                    lsof \
-                    zsh \
-                    fish \
-                    pkgfile \
-                    sl \
-                    rar
-
-                sudo pkgfile --update
-                source "$dir/../Software/openssh/main.fish"
-                source "$dir/../Software/vim/main.fish"
-                source "$dir/../Software/git/main.fish"
-                source "$dir/../Software/zoxide/main.fish"
-
-                # GRUB Shenanigans - if that's not an essential I don't know what is!
-                source "$dir/../Software/minegrub-theme/main.fish";
-            end
-
-            if collectionActive common
-                yayinst \
-                    tldr \
-                    btop \
-                    nvtop \
-                    numbat-bin \
-                    terminal-parrot
-
-                source "$dir/../Software/aliae/main.fish"
-            end
-
-            if collectionActive desktopExperience
-                yayinst \
-                    maliit-keyboard \
-                    dconf-editor \
-                    flatpak (
-                        # Fixes: https://www.reddit.com/r/flatpak/comments/168tav2/how_to_fix_blurry_flatpaks_on_high_resolution/
-                    ) xdg-desktop-portal-gtk
-
-                source "$dir/../Software/KDE/main.fish"
-                source "$dir/../Software/sddm/main.fish"
-
-                # Fonts
-                yayinst \
-                    ttf-cascadia-code-nerd \
-                    ttf-ms-win11-auto \
-                    otf-cascadia-code \
-                    ttf-droid
-            end
-
-            if collectionActive server
-            else
-                # Energy Saving
-                yayinst power-profiles-daemon
-                sudo systemctl enable --now power-profiles-daemon
-
-                # Networking
-                yayinst \
-                    networkmanager-openvpn \
-                    networkmanager-openconnect
-            end
-        end
     end
 
     source "$dir/../../Common/OS/install.fish"

scripts/Arch/OS/setup.fish

@@ -1,7 +1,6 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
     source "$dir/../../Common/OS/setup.fish"
     source "$dir/../../Common/Scripts/config.fish"
 
@@ -12,10 +11,14 @@ begin
     end
 
     function installValhallaDeps -V mountDir
-        pacstrap -K "$mountDir" fish jq nix tmux
+        pacstrap -K "$mountDir" fish git jq nix sudo tmux
     end
 
-    function setupOS -S -V dir -V CONFIG_MODULE -V mountDir
+    function getInstallerScript -V dir -S
+        echo "$dir/install.fish"
+    end
+
+    function setupOS -S -V dir -V mountDir
         source "$dir/../../Common/Scripts/wait-network.fish"
         source "$dir/../../Common/Scripts/hooks.fish"
 
@@ -69,6 +72,7 @@ begin
             end | begin
                 read LOCALES
                 and arch-chroot "$mountDir" sed -i "s/^#\?\(\($LOCALES\).*\)\$/\1/" /etc/locale.gen
+                and arch-chroot "$mountDir" locale-gen
             end
 
             and begin
@@ -82,19 +86,12 @@ begin
                 true
             end
 
-            and echo "$ARCH_HOSTNAME" | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
+            and echo (getConfig valhalla.hostname) | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
             
             and arch-chroot "$mountDir" mkinitcpio -P
             and runHook installDrivers "Installing drivers..." || true
-            and runInOS fish "$tempDir/../../Common/Software/nix/main.fish" configure user
-            and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
             and runInOS fish "$tempDir/../Software/GRUB/main.fish"
 
-            and USER_NAME="$USER_NAME" \
-            USER_DISPLAYNAME="$USER_DISPLAYNAME" \
-            USER_GROUPS="$USER_GROUPS" \
-                arch-chroot "$mountDir" bash "$tempDir/user.sh"
-
             and if set -l keyLayout (getConfig valhalla.keyboardLayout)
                 set -l serviceName set-keymap.service
                 and set -l serviceFile "$mountDir/etc/systemd/system/$serviceName"
@@ -113,7 +110,7 @@ begin
         set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
         arch-chroot "$mountDir" mkdir -p (dirname "$file")
 
-        begin
+        and begin
             printf %s\n \
                 "[Service]" \
                 "ExecStart=" \

scripts/Arch/Scripts/deploy.fish

@@ -0,0 +1,277 @@
+function deploySoftware -d "Deploys a the specified software action" -a action
+    set -l dir (status dirname)
+    . "$dir/software.fish"
+
+    if [ -z "$action" ]
+        set action "install"
+    end
+
+    set -l isInstall (
+        if [ "$action" = "install" ]
+            echo true
+        else
+            echo false
+        end
+    )
+
+    if collectionActive essential
+        if $isInstall
+            yayinst \
+                mkinitcpio-firmware \
+                neofetch \
+                bash-completion \
+                wget \
+                screen \
+                tmux \
+                htop \
+                lsof \
+                zsh \
+                fish \
+                pkgfile \
+                sl \
+                rar
+
+            and sudo pkgfile --update
+        end
+
+        and source "$dir/../../Common/Software/bash/main.fish" $argv
+        and source "$dir/../Software/sudo/main.fish" $argv
+        and source "$dir/../Software/Oh My Posh/main.fish" $argv
+        and source "$dir/../Software/openssh/main.fish" $argv
+        and source "$dir/../Software/vim/main.fish" $argv
+        and source "$dir/../Software/git/main.fish" $argv
+        and source "$dir/../Software/zoxide/main.fish" $argv
+        and source "$dir/../Software/logo-ls/main.fish" $argv
+
+        # GRUB Shenanigans - if that's not essential I don't know what is!
+        and source "$dir/../Software/minegrub-theme/main.fish" $argv
+    end
+
+    and if collectionActive common
+        if $isInstall
+            yayinst \
+                tldr \
+                btop \
+                terminal-parrot
+        end
+
+        and source "$dir/../Software/aliae/main.fish" $argv
+    end
+
+    and if collectionActive desktopExperience
+        source "$dir/../Software/KDE/main.fish" $argv
+        and source "$dir/../Software/sddm/main.fish" $argv
+
+        and if $isInstall
+            yayinst \
+                maliit-keyboard \
+                dconf-editor \
+                flatpak (
+                    # Fixes: https://www.reddit.com/r/flatpak/comments/168tav2/how_to_fix_blurry_flatpaks_on_high_resolution/
+                ) xdg-desktop-portal-gtk
+
+            # Fonts
+            and yayinst \
+                ttf-cascadia-code-nerd \
+                ttf-ms-win11-auto \
+                otf-cascadia-code \
+                ttf-droid
+
+            # Password Management
+            and yayinst \
+                bitwarden \
+                keepass \
+                keepassxc
+
+            # Tools
+            and yayinst \
+                android-tools \
+                blackbox-terminal \
+                cpu-x \
+                gnome-calculator \
+                yubikey-manager-qt \
+                wireshark-qt \
+                linux-wifi-hotspot
+
+            # Remote Access
+            and yayinst \
+                remmina (
+                    # RDP support for Remmina
+                ) freerdp
+
+            # Creativity
+            and yayinst \
+                gimp \
+                inkscape
+
+            # Office stuff
+            and yayinst \
+                libreoffice-fresh \
+                naps2-bin \
+                pdfarranger \
+                protonmail-bridge \
+                thunderbird
+
+            and yayinst \
+                texlive \
+                texlive-langgerman
+
+            # Virtualization
+            and yayinst propertree-git # mac .plist config file editor
+
+            and if collectionActive school
+                yayinst \
+                    teams-for-linux \
+                    xournalpp-git \
+                    rnote
+            end
+        end
+
+        # Internet Access
+        and source "$dir/../Software/Firefox/main.fish" $argv
+        and source "$dir/../Software/brave/main.fish" $argv
+        and source "$dir/../Software/Pennywise/main.fish" $argv
+
+        # Virtualization
+        and source "$dir/../Software/waydroid/main.fish" $argv
+        and source "$dir/../Software/Virtual Machine Manager/main.fish" $argv
+
+        and if collectionActive coding
+            if $isInstall
+                yayinst \
+                    devdocs-desktop \
+                    godot-mono
+            end
+
+            and source "$dir/../Software/vscode/main.fish" $argv
+        end
+    end
+
+    and if collectionActive server
+    else
+        if $isInstall
+            # Energy Saving
+            yayinst power-profiles-daemon
+            and sudo systemctl enable --now power-profiles-daemon
+
+            # Networking
+            and yayinst \
+                networkmanager-openvpn \
+                networkmanager-openconnect \
+                proton-vpn-gtk-app \
+                protonvpn-cli-community
+        end
+
+        and if collectionActive common
+            if $isInstall
+                and yayinst \
+                    img2pdf \
+                    numbat-bin \
+                    nvtop \
+                    pdf2svg \
+                    tnef
+            end
+
+            and source "$dir/../Software/IcedTea/main.fish" $argv
+        end
+    end
+
+    and if collectionActive media && $isInstall
+        yayinst \
+            ytmdesktop-bin \
+            netflix \
+            spotube-bin \
+            stremio \
+            tidal-dl-ng \
+            tidal-hifi-bin \
+            nuclear-player-bin \
+            audius-client-bin
+    end
+
+    and if collectionActive fileSync
+        if $isInstall
+            yayinst nextcloud-client
+        end
+
+        and source "$dir/../Software/rclone/main.fish" $argv
+    end
+
+    and if collectionActive socialMedia && $isInstall
+        yayinst \
+            signal-desktop \
+            vesktop-bin
+
+        and begin
+            yes y | runYay threema-desktop
+        end
+
+        and begin
+            yes y | runYay nodejs
+        end
+    end
+
+    and if collectionActive productivity && $isInstall
+        yayinst \
+            anki-bin
+    end
+
+    and if collectionActive school && $isInstall
+        yayinst \
+            jdk17-temurin \
+            gradle \
+            jetbrains-toolbox
+
+        and source "$dir/../../Common/Software/udev/ct-board.fish"
+    end
+
+    and if collectionActive coding
+        if $isInstall
+            yayinst \
+                archiso \
+                wimlib (
+                    # ISO support for wimlib
+                ) cdrkit \
+                tea \
+                woodpecker-cli (
+                    # AsciiDocs
+                ) python-docutils (
+                    # reStructuredText
+                ) esbonio
+        end
+
+        and source "$dir/../Software/n/main.fish" $argv
+    end
+
+    and if collectionActive python
+        if $isInstall
+            yayinst \
+                python \
+                python-pip \
+                python-pipenv
+        end
+
+        and source "$dir/../Software/pyenv/main.fish" $argv
+    end
+
+    and if collectionActive gaming
+        if $isInstall
+            yayinst \
+                steam \
+                chiaki-ng \
+                osu-lazer-bin \
+                libretro \
+                supertux \
+                gamepad-tool-bin
+
+            and sudo flatpak install -y flathub com.usebottles.bottles
+        end
+
+        and source "$dir/../Software/Lutris/main.fish" $argv
+    end
+
+    and if collectionActive essential && $isInstall
+        yayinst bb
+    end
+end
+
+deploySoftware $argv

scripts/Arch/Scripts/software.fish

@@ -3,11 +3,25 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Common/Scripts/software.fish"
 
+    function runYay -d "Run yay with pre-configured defaults"
+        if not isatty 0
+            echo "stdin detected" 1>&2
+            cat
+        end | yay --needed --answerclean=None --answerdiff=None -Syu $argv
+    end
+
     function yayinst -d "Install yay-package non-interactively"
-        yay --noconfirm --needed --answerclean=None --answerdiff=None -Syu $argv
+        runYay --noconfirm $argv
+    end
+
+    function runPacman -d "Run pacman with pre-configured defaults"
+        if not isatty 0
+            echo "stdin detected" 1>&2
+            cat
+        end | sudo pacman --needed -Syu $argv
     end
 
     function pacinst -d "Install pacman-package non-interactively"
-        sudo pacman --noconfirm --needed -Syu $argv
+        runPacman --noconfirm $argv
     end
 end

scripts/Arch/Software/Firefox/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW -V dir
+        yayinst firefox
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/Firefox/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/GRUB/main.fish

@@ -2,7 +2,6 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/GRUB/main.fish"
 
     function installSW -V dir
         pacinst \
@@ -10,7 +9,7 @@ begin
             efibootmgr \
             os-prober
 
-        configureSW
+        fish "$dir/../../../Common/Software/GRUB/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/IcedTea/main.fish

@@ -0,0 +1,22 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst \
+            jdk-temurin
+
+        yayinst \
+            icedtea-web
+    end
+
+    function configureSW
+        # Allow execution of huwaei KVM application (uses out of date security mechanisms)
+        sudo sed -i \
+            "/^jdk.jar.disabledAlgorithms=/{ :comment; s/\(.*\)/#\1/; /\\\\\$/{ n; bcomment; }; }" \
+            /usr/lib/jvm/default-runtime/conf/security/java.security
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/KDE/main.fish

@@ -19,8 +19,6 @@ begin
                 # File Exchange Support for KDE Connect: https://wiki.archlinux.org/title/KDE#KDE_Connect
             ) sshfs \
             fwupd
-
-        configureSW
     end
 
     function configureSW

scripts/Arch/Software/Lutris/main.fish

@@ -0,0 +1,72 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst \
+            wine-staging \
+            giflib \
+            lib32-giflib \
+            libpng \
+            lib32-libpng \
+            libldap \
+            lib32-libldap \
+            gnutls \
+            lib32-gnutls \
+            mpg123 \
+            lib32-mpg123 \
+            openal \
+            lib32-openal \
+            v4l-utils \
+            lib32-v4l-utils \
+            libpulse \
+            lib32-libpulse \
+            libgpg-error \
+            lib32-libgpg-error \
+            alsa-plugins \
+            lib32-alsa-plugins \
+            alsa-lib \
+            lib32-alsa-lib \
+            libjpeg-turbo \
+            lib32-libjpeg-turbo \
+            sqlite \
+            lib32-sqlite \
+            libxcomposite \
+            lib32-libxcomposite \
+            libxinerama \
+            lib32-libgcrypt \
+            libgcrypt \
+            lib32-libxinerama \
+            ncurses \
+            lib32-ncurses \
+            ocl-icd \
+            lib32-ocl-icd \
+            libxslt \
+            lib32-libxslt \
+            libva \
+            lib32-libva \
+            gtk3 \
+            lib32-gtk3 \
+            gst-plugins-base-libs \
+            lib32-gst-plugins-base-libs \
+            vulkan-icd-loader \
+            lib32-vulkan-icd-loader
+
+        yayinst (
+                # Extracting GOG games
+            ) innoextract \
+            gamemode \
+            lib32-gamemode \
+            vkd3d \
+            lib32-vkd3d \
+            gamescope \
+            yad \
+            protontricks \
+            protonup-qt-bin
+
+        yayinst lutris
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/Oh My Posh/main.fish

@@ -0,0 +1,20 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/Oh My Posh/main.fish"
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst oh-my-posh-bin
+    end
+
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -S -V base -a name
+        fish "$base" userConfig $argv
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/Pennywise/main.fish

@@ -0,0 +1,23 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst \
+            pennywise-bin
+    end
+
+    function configureSW
+        set -l patch " --no-sandbox"
+        set -l pattern "^Exec=.*"
+        set -l indicator "$pattern$patch"
+        set -l file /usr/share/applications/pennywise.desktop
+
+        if ! grep "$indicator" "$file" > /dev/null
+            sudo sed -i "/$pattern/s/$pattern/\0 --no-sandbox/" "$file"
+        end
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/PowerShell/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst powershell-bin
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/PowerShell/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/Virtual Machine Manager/main.fish

@@ -0,0 +1,26 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst qemu-full
+        yes | runPacman --asdeps iptables-nft
+
+        yes | yayinst \
+            virtiofsd \
+            virt-manager \
+            dnsmasq \
+            swtpm \
+            lxc \
+            virt-bootstrap-git
+    end
+
+    function configureSW -V dir
+        sudo systemctl enable --now libvirtd
+        sudo systemctl enable --now virtlogd
+        fish "$dir/../../../Common/Software/Virtual Machine Manager/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/aliae/main.fish

@@ -1,14 +1,20 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/aliae/main.fish"
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/aliae/main.fish"
 
     function installSW
         yayinst \
             aliae-bin
+    end
 
-        configureSW
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base
+        fish "$base" userConfig $argv
     end
 
     runInstaller $argv

scripts/Arch/Software/brave/main.fish

@@ -0,0 +1,18 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst brave-bin (
+            # brave-beta-bin
+            # brave-nightly-bin
+        )
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/brave/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/git/main.fish

@@ -1,9 +1,10 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/git/main.fish"
     source "$dir/../../Scripts/software.fish"
 
-    function installSW -V dir
+    function installSW
         yayinst \
             git \
             git-lfs \
@@ -11,8 +12,14 @@ begin
             gitflow-bashcompletion-avh \
             gitflow-fishcompletion-avh \
             gitflow-zshcompletion-avh
+    end
 
-        and fish "$dir/../../../Common/Software/git/main.fish" configure
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base
+        fish "$base" userConfig $argv
     end
 
     runInstaller $argv

scripts/Arch/Software/logo-ls/main.fish

@@ -0,0 +1,42 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW -V dir
+        set -l dirName (realpath "$dir")
+        set -l contextRoot (mktemp -d)
+        set -l pkgName logo-ls
+        set -l patchName workaround.patch
+
+        if not type -q logo-ls
+            begin
+                pushd "$contextRoot" > /dev/null
+                yay -G -f "$pkgName"
+                cd "$pkgName"
+                cp "$dirName/$patchName" .
+
+                sed -i \
+                    -e "/^source=(/s/source=(/\0$patchName /" \
+                    -e "/^md5sums=(/s/^md5sums=(/\0SKIP /" \
+                    -e "/^build() {/,/}/{" \
+                        -e "/^[[:space:]]*cd/{" \
+                            -e "a cat ../$patchName | patch --strip 1 --forward --merge" \
+                        -e "}" \
+                    -e "}" \
+                    PKGBUILD
+
+                makepkg --noconfirm -si --force
+                popd > /dev/null
+            end
+
+            rm -rf "$contextRoot"
+        end
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/logo-ls/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/minegrub-theme/main.fish

@@ -2,11 +2,13 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/minegrub-theme/main.fish"
 
     function installSW
         yayinst grub-theme-minegrub-git
-        configureSW
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/minegrub-theme/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/n/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst nodejs-n
+    end
+
+    function configureSW -V dir
+        sudo --preserve-env --set-home fish "$dir/../../../Common/Software/n/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/nix/main.fish

@@ -0,0 +1,20 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst \
+            nix \
+            nil-git
+
+        configureSW
+    end
+
+    function configureSW -V dir
+        sudo systemctl enable --now nix-daemon
+        fish "$dir/../../../Common/Software/nix/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/openssh/main.fish

@@ -10,7 +10,7 @@ begin
     end
 
     function configureSW
-        systemctl --global enable --now ssh-agent
+        sudo systemctl --global enable ssh-agent
 
         and begin
             printf %s\n \

scripts/Arch/Software/pyenv/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst pyenv
+    end
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/pyenv/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/rclone/main.fish

@@ -0,0 +1,21 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/rclone/main.fish"
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst \
+            rclone
+    end
+
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base -a name
+        fish "$base" userConfig $argv
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/sddm/main.fish

@@ -8,13 +8,12 @@ begin
         # yes | yayinst sddm-git
         # stable version
         yayinst sddm
-        configureSW
     end
 
     function configureSW -V dir
         set -l configDir /etc/sddm.conf.d
         sudo systemctl enable sddm
-        mkdir -p "$configDir"
+        sudo mkdir -p "$configDir"
         sudo cp "$dir/wayland.conf" "$configDir/10-wayland.conf"
     end
 

scripts/Arch/Software/sudo/main.fish

@@ -0,0 +1,15 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        pacinst sudo
+    end
+
+    function configureSW
+        echo "%wheel ALL=(ALL:ALL) ALL" | sudo tee /etc/sudoers.d/wheel > /dev/null
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/vim/main.fish

@@ -12,8 +12,11 @@ begin
                 # Add clipboard support for wayland: https://www.reddit.com/r/Fedora/comments/ax9p9t/comment/jjb4p7b/
             ) vim-wayland-clipboard-git \
             wl-clipboard
+    end
 
-        and configureSW
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/vim/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/vscode/main.fish

@@ -0,0 +1,31 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst \
+            vscodium-bin \
+            visual-studio-code-bin (
+                # Trash functionality
+            ) gvfs
+    end
+
+    function configureSW -V dir
+        set -l bins codium code
+
+        for bin in $bins
+            if type -q "$bin"
+                begin
+                    set -l file "/etc/skel/.config/$bin-flags.conf"
+                    sudo mkdir -p (dirname "$file")
+                    echo "--touch-events" | sudo tee "$file" > /dev/null
+                end
+            end
+        end
+
+        fish "$dir/../../../Common/Software/vscode/main.fish" configure
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/waydroid/main.fish

@@ -0,0 +1,20 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        yayinst (
+            # Waydroid prerequisite: https://wiki.archlinux.org/title/Waydroid#DKMS_modules
+        ) binder_linux-dkms \
+        waydroid (
+            # For installing ARM suppot on waydroid
+        ) waydroid-script-git (
+            # Clipboard support: https://wiki.archlinux.org/title/Waydroid#Failed_to_start_Clipboard_manager_service
+        ) python-pyclip (
+            # Wayland clipboard support: https://github.com/spyoungtech/pyclip?tab=readme-ov-file#linux
+        ) wl-clipboard
+    end
+
+    runInstaller $argv
+end

scripts/Arch/Software/zoxide/main.fish

@@ -2,13 +2,14 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/zoxide/main.fish"
 
     function installSW
         yayinst \
             zoxide
+    end
 
-        configureSW
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/zoxide/main.fish" configure
     end
 
     runInstaller $argv

scripts/Common/Config/Firefox/install.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 pushd "${BASH_SOURCE%/*}" > /dev/null;
-sudo cp ./firefox.sh /etc/profile.d/;
+sudo cp ../../Software/Firefox/firefox.sh /etc/profile.d/;
 popd > /dev/null;

scripts/Common/Config/Oh My Posh/install.ps1

@@ -1,10 +1,10 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Software/powershell/profile.ps1";
+. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
 
 Add-PowerShellProfileStatement `
     -System `
     -Category "oh-my-posh" `
-    -Statement $(
+    -Script $(
         @(
             "# Oh My Posh!",
             $(Get-ScriptInitializer "oh-my-posh init pwsh"),

scripts/Common/Config/aliae/install.ps1

@@ -1,8 +1,8 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Software/powershell/profile.ps1";
+. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
 
 foreach ($defaultUser in @($true, $false)) {
-    Add-PowerShellProfileStatement -DefaultUser:$defaultUser -Statement "# aliae`naliae init pwsh | Invoke-Expression";
+    Add-PowerShellProfileStatement -DefaultUser:$defaultUser -Script "# aliae`naliae init pwsh | Invoke-Expression";
 }
 
-Add-PowerShellProfileStatement -System -Category "aliae" -Statement "# aliae`n$(Get-ScriptInitializer "aliae completion powershell")";
+Add-PowerShellProfileStatement -System -Category "aliae" -Script "# aliae`n$(Get-ScriptInitializer "aliae completion powershell")";

scripts/Common/Config/rclone/install.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
+pushd "${BASH_SOURCE%/*}/../../Software/rclone" > /dev/null;
 
 sudo cp "rclone.service" "rclone.target" "rclone@.service" /etc/systemd/user;
 systemctl enable --user rclone;

scripts/Common/Config/zoxide/install.ps1

@@ -1,10 +1,10 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Software/powershell/profile.ps1";
+. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
 
 Add-PowerShellProfileStatement `
     -System `
     -Category "zoxide" `
-    -Statement $(
+    -Script $(
         @(
             "# zoxide",
             $(Get-ScriptInitializer "zoxide init powershell | Out-String")