Restructure the script directory

archiso/scripts/build.fish

@@ -1,6 +1,6 @@
 #!/bin/env fish
 begin
-    source "$(status dirname)/../../scripts/config.fish"
+    source "$(status dirname)/../../scripts/lib/config.fish"
     set -l projectName archiso-valhalla
     set -l overlayDir (mktemp -d)
     set -l upperDir (mktemp -d)
@@ -14,7 +14,7 @@ begin
     set -l nixDir "$profileDir/$root/nix/var/nix/profiles/per-user/root/channels/nixpkgs"
 
     mkdir -p "$rootHome"
-    and fish "$(status dirname)/../../scripts/copy-repo.fish" "$projectDir"
+    and fish "$(status dirname)/../../scripts/lib/copy-repo.fish" "$projectDir"
 
     and begin
         if [ ! -d "$nixCache" ]

scripts/Arch/Config/SecureBoot/main.fish

@@ -1,14 +1,14 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW -V dir
         yayinst secureboot-grub
     end
 
     function configureSW -V dir
-        source "$dir/../../../Common/Scripts/settings.fish"
+        source "$dir/../../../lib/settings.fish"
         set -l label (getOSConfig boot.label)
         set -l efiDir (getOSConfig boot.efiMountPoint)
         set -l bootNums (efibootmgr | sed "/$label/{ s/^.*Boot\([[:digit:]]\+\)\*.*\$/\1/; p; }; d")

scripts/Arch/Drivers/Surface/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW -V dir
         set -l repo linux-surface

scripts/Arch/Drivers/SurfaceBook2/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW -V dir
         yayinst \

scripts/Arch/OS/install.fish

@@ -3,21 +3,21 @@ begin
     set -l dir (status dirname)
 
     function installValhallaDeps -V dir
-        source "$dir/../Scripts/software.fish"
+        source "$dir/../lib/software.fish"
         and pacinst fish git jq nix sudo tmux
     end
 
     function getDeploymentScript -V dir
-        echo "$dir/../Scripts/deploy.fish"
+        echo "$dir/../lib/deploy.fish"
     end
 
     function initialize -V dir
-        source "$dir/../../Common/Scripts/wait-network.fish"
+        source "$dir/../../lib/wait-network.fish"
         waitNetwork
         or exit
 
         sudo systemctl enable --now nix-daemon
-        and source "$dir/../Scripts/software.fish"
+        and source "$dir/../lib/software.fish"
         and source "$dir/../Software/base-devel/main.fish"
         and source "$dir/../Software/pacman/main.fish"
         and source "$dir/../Software/yay/main.fish"

scripts/Arch/OS/setup.fish

@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Common/OS/setup.fish"
-    source "$dir/../../Common/Scripts/settings.fish"
+    source "$dir/../../lib/settings.fish"
 
     function runChroot -S
         arch-chroot $argv
@@ -23,8 +23,8 @@ begin
     end
 
     function setupOS -S -V dir -S
-        source "$dir/../../Common/Scripts/hooks.fish"
-        source "$dir/../../Common/Scripts/wait-network.fish"
+        source "$dir/../../lib/hooks.fish"
+        source "$dir/../../lib/wait-network.fish"
 
         waitNetwork
         and begin

scripts/Arch/Software/aliae/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/aliae/main.fish"
 
     function installSW

scripts/Arch/Software/base-devel/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         pacinst base-devel

scripts/Arch/Software/brave/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/brave/main.fish"
 
     function installSW

scripts/Arch/Software/docker/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/docker/main.fish"
 
     function installSW

scripts/Arch/Software/firefox/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/firefox/main.fish"
 
     function installSW -V dir

scripts/Arch/Software/git/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/git/main.fish"
 
     function installSW

scripts/Arch/Software/grub/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/grub/main.fish"
 
     function installSW -V dir

scripts/Arch/Software/icedtea/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst \

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

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/logo-ls/main.fish"
 
     function installSW -V dir

scripts/Arch/Software/lutris/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst \

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

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/minegrub-theme/main.fish"
 
     function installSW

scripts/Arch/Software/nix/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/nix/main.fish"
 
     function installSW

scripts/Arch/Software/nodejs-n/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst nodejs-n

scripts/Arch/Software/nvidia-dkms/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/nvidia-dkms/main.fish"
 
     function installSW

scripts/Arch/Software/oh-my-posh/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/oh-my-posh/main.fish"
 
     function installSW

scripts/Arch/Software/openssh/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst \

scripts/Arch/Software/pacman/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         configureSW

scripts/Arch/Software/pennywise/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst \

scripts/Arch/Software/plasma/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst \

scripts/Arch/Software/powershell/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/powershell/main.fish"
 
     function installSW

scripts/Arch/Software/pyenv/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/pyenv/main.fish"
 
     function installSW

scripts/Arch/Software/rclone/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/rclone/main.fish"
 
     function installSW

scripts/Arch/Software/sddm/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         # `git` version

scripts/Arch/Software/steam/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst steam
@@ -9,7 +9,7 @@ begin
 
 
     function configureSW -V dir
-        . "$dir/../../../Common/Scripts/settings.fish"
+        . "$dir/../../../lib/settings.fish"
 
         if isOSEnabled hidpi
             begin

scripts/Arch/Software/sudo/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         pacinst sudo

scripts/Arch/Software/vim/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/vim/main.fish"
 
     function installSW

scripts/Arch/Software/virt-manager/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/virt-manager/main.fish"
 
     function installSW

scripts/Arch/Software/vscode/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function setFlags -a user
         set -l flags

scripts/Arch/Software/waydroid/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         yayinst (

scripts/Arch/Software/xone/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         set -l contextRoot (mktemp -d)

scripts/Arch/Software/yay/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function installSW
         if not type -q yay

scripts/Arch/Software/zoxide/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
     inherit "$dir/../../../Common/Software/zoxide/main.fish"
 
     function installSW

scripts/Arch/lib/software.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Common/Scripts/software.fish"
+    source "$dir/../../lib/software.fish"
 
     function runYay -d "Run yay with pre-configured defaults"
         if not isatty 0

scripts/Common/Drivers/Logitech G903/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         . "$dir/../../Software/plasma/input.fish"

scripts/Common/Drivers/SurfaceBook2/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         . "$dir/../../Software/plasma/input.fish"

scripts/Common/OS/install.fish

@@ -1,11 +1,11 @@
 #!/bin/env fish
 set -l dir (status dirname)
 set -l cmdline (cat /proc/$fish_pid/cmdline | string split0)
-source "$dir/../Scripts/settings.fish"
-source "$dir/../Scripts/hooks.fish"
+source "$dir/../../lib/settings.fish"
+source "$dir/../../lib/hooks.fish"
 
 if [ (id -u) -eq 0 ]
-    source "$dir/../../config.fish"
+    source "$dir/../../lib/config.fish"
     set -l sudoConfig "/etc/sudoers.d/PortValhalla"
     set -l channelDir /nix/var/nix/profiles/per-user/root/channels/nixpkgs
     rm ~/.bash_profile
@@ -79,7 +79,7 @@ else
 
     runHook initializeUsers || begin
         if [ -n "$deployScript" ]
-            source "$dir/../Scripts/settings.fish"
+            source "$dir/../../lib/settings.fish"
 
             for name in (getUsers | jq '.[]' --raw-output0 | string split0)
                 echo "Configuring user `$name`..."

scripts/Common/OS/setup.fish

@@ -1,8 +1,8 @@
 #!/bin/env fish
 function runSetup
     set -l dir (status dirname)
-    source "$dir/../Scripts/settings.fish"
-    source "$dir/../Scripts/hooks.fish"
+    source "$dir/../../lib/settings.fish"
+    source "$dir/../../lib/hooks.fish"
 
     if [ -z "$CONFIG_NAME" ]
         selectProfile config
@@ -60,7 +60,7 @@ function runSetup
     and runHook --force installValhallaDeps 'Please set up a function `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.'
 
     and echo "Cloning project..."
-    and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
+    and source "$dir/../../lib/copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT"
     runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT"
     and runHook setupOS
 

scripts/Common/OS/users.fish

@@ -1,6 +1,6 @@
 #!/bin/env fish
 set -l dir (status dirname)
-source "$dir/../Scripts/settings.fish"
+source "$dir/../../lib/settings.fish"
 set -l users (getUsers)
 
 echo "Creating users..."

scripts/Common/Software/aliae/Main.ps1

@@ -1,6 +1,6 @@
 . "$PSScriptRoot/Constants.ps1";
 . "$PSScriptRoot/../powershell/Profile.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 Start-SoftwareInstaller @args `
     -Configurator {

scripts/Common/Software/aliae/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         source "$dir/../bash/profile.fish"

scripts/Common/Software/bash/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         begin

scripts/Common/Software/bash/profile.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/profile-base.fish"
+    source "$dir/../../../lib/profile-base.fish"
 
     function getBashStatements
     end

scripts/Common/Software/brave/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         set -l bin

scripts/Common/Software/docker/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         sudo systemctl enable --now docker

scripts/Common/Software/firefox/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         sudo cp "$dir/firefox.sh" /etc/profile.d/

scripts/Common/Software/fish/profile.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/profile-base.fish"
+    source "$dir/../../../lib/profile-base.fish"
 
     function installFishProfile -a name title
         addProfileStatement "$name" "$title" "/bin/env fish" fish /etc/fish/conf.d $argv[3..]

scripts/Common/Software/git/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../Scripts/Software.ps1";
-. "$PSScriptRoot/../../Scripts/System.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
+. "$PSScriptRoot/../../../lib/System.ps1";
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
 & {

scripts/Common/Software/git/main.fish

@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     set -l base "$dir/Main.ps1"
-    source "$(status dirname)/../../Scripts/software.fish"
+    source "$(status dirname)/../../../lib/software.fish"
 
     function configureSW -S -V base
         pwsh "$base" Configure

scripts/Common/Software/grub/main.fish

@@ -1,8 +1,8 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/settings.fish"
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/settings.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW
         set -l efiDir (getOSConfig boot.efiMountPoint)

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

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         source "$dir/../bash/profile.fish"

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

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         sudo sed -i \

scripts/Common/Software/nix/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir -a scope
         sudo nix-channel --add https://nixos.org/channels/nixpkgs-unstable

scripts/Common/Software/nodejs-n/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function installSW
         npm install --global n

scripts/Common/Software/nuke-usb/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function installSW -V dir
         sudo install -m 755 "$dir/nuke-usb.sh" /usr/local/bin/nuke-usb

scripts/Common/Software/nvidia-dkms/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         # According to: https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks

scripts/Common/Software/oh-my-posh/Main.ps1

@@ -1,6 +1,6 @@
 . "$PSScriptRoot/../aliae/Manage.ps1";
 . "$PSScriptRoot/../powershell/Profile.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `

scripts/Common/Software/oh-my-posh/main.fish

@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     set -l base "$dir/Main.ps1"
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir -V base
         source "$dir/../bash/profile.fish"

scripts/Common/Software/posh-git/Main.ps1

@@ -1,5 +1,5 @@
 . "$PSScriptRoot/../powershell/Module.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 $parameters = Get-ModuleInstallerComponents "posh-git";
 Start-SoftwareInstaller @args @parameters;

scripts/Common/Software/posh-git/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function installSW -V dir
         sudo -HE pwsh "$dir/Main.ps1"

scripts/Common/Software/powershell/Main.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../Software/powershell/Profile.ps1";
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 

scripts/Common/Software/powershell/Profile.ps1

@@ -1,6 +1,6 @@
 $null = New-Module {
-    . "$PSScriptRoot/../../Scripts/Scripting.ps1";
-    . "$PSScriptRoot/../../Scripts/Software.ps1";
+    . "$PSScriptRoot/../../../lib/Scripting.ps1";
+    . "$PSScriptRoot/../../../lib/Software.ps1";
 
     <#
         .SYNOPSIS

scripts/Common/Software/powershell/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         sudo -HE pwsh "$dir/Main.ps1" Configure

scripts/Common/Software/pyenv/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function installSW
         curl https://pyenv.run | bash

scripts/Common/Software/rclone/main.fish

@@ -1,14 +1,14 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         sudo cp "$dir/rclone.service" "$dir/rclone.target" "$dir/rclone@.service" /etc/systemd/user
     end
 
     function userConfig -V dir -a name
-        source "$dir/../../Scripts/settings.fish"
+        source "$dir/../../../lib/settings.fish"
         set -l key "programs.rclone.configurations"
         set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json)
 

scripts/Common/Software/terminal-icons/Main.ps1

@@ -1,5 +1,5 @@
 . "$PSScriptRoot/../powershell/Module.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 $parameters = Get-ModuleInstallerComponents "Terminal-Icons";
 Start-SoftwareInstaller @args @parameters;

scripts/Common/Software/terminal-icons/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function installSW -V dir
         sudo -HE pwsh "$dir/Main.ps1"

scripts/Common/Software/vim/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW
         set -l configFile /etc/vimrc

scripts/Common/Software/virt-manager/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW
         begin

scripts/Common/Software/vscode/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
+. "$PSScriptRoot/../../../lib/SoftwareManagement.ps1";
 
 Start-SoftwareInstaller @args `
     -UserConfigurator {

scripts/Common/Software/vscode/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function userConfig -V dir
         runPSUserConfig "$dir/Main.ps1" $argv

scripts/Common/Software/zoxide/Main.ps1

@@ -1,5 +1,5 @@
 . "$PSScriptRoot/../powershell/Profile.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 Start-SoftwareInstaller @args `
     -Configurator {

scripts/Common/Software/zoxide/main.fish

@@ -1,7 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
-    source "$dir/../../Scripts/software.fish"
+    source "$dir/../../../lib/software.fish"
 
     function configureSW -V dir
         source "$dir/../bash/profile.fish"

scripts/Windows/Drivers/AMDChipsetX399/Main.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 Start-SoftwareInstaller -Force @args `
     -Installer {

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

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/System.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
+. "$PSScriptRoot/../../../lib/System.ps1";
 
 Start-SoftwareInstaller -Force @args `
     -Installer {

scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Main.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../lib/Software.ps1";
 
 Start-SoftwareInstaller -Force @args `
     -Installer {

scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Main.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../lib/Software.ps1";
 
 Start-SoftwareInstaller -Force @args `
     -Installer {

scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Main.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../lib/Software.ps1";
 
 Start-SoftwareInstaller -Force @args `
     -Installer {

scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Main.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../lib/Software.ps1";
 
 Start-SoftwareInstaller -Force @args `
     -Installer {

scripts/Windows/Drivers/Tobii EyeX/Main.ps1

@@ -1,6 +1,6 @@
 & {
-    . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-    . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+    . "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+    . "$PSScriptRoot/../../../lib/Software.ps1";
     $softwarePath = "$PSScriptRoot/../../Software";
 
     $appScripts = @(

scripts/Windows/OS/Manage.ps1

@@ -1,24 +1,24 @@
 #!/bin/pwsh
 using namespace System.Security.Principal;
 
-. "$PSScriptRoot/../Scripts/Security.ps1";
-. "$PSScriptRoot/../Scripts/WSL.ps1";
+. "$PSScriptRoot/../lib/Security.ps1";
+. "$PSScriptRoot/../lib/WSL.ps1";
 
 $null = New-Module {
-    . "$PSScriptRoot/../Scripts/Constants.ps1";
-    . "$PSScriptRoot/../Scripts/Deployment.ps1";
-    . "$PSScriptRoot/../Scripts/PowerManagement.ps1";
-    . "$PSScriptRoot/../Scripts/Registry.ps1";
-    . "$PSScriptRoot/../Scripts/Security.ps1";
-    . "$PSScriptRoot/../Scripts/SoftwareManagement.ps1";
-    . "$PSScriptRoot/../Scripts/System.ps1";
-    . "$PSScriptRoot/../Scripts/Update.ps1";
-    . "$PSScriptRoot/../Scripts/Users.ps1";
+    . "$PSScriptRoot/../lib/Constants.ps1";
+    . "$PSScriptRoot/../lib/Deployment.ps1";
+    . "$PSScriptRoot/../lib/PowerManagement.ps1";
+    . "$PSScriptRoot/../lib/Registry.ps1";
+    . "$PSScriptRoot/../lib/Security.ps1";
+    . "$PSScriptRoot/../lib/SoftwareManagement.ps1";
+    . "$PSScriptRoot/../lib/System.ps1";
+    . "$PSScriptRoot/../lib/Update.ps1";
+    . "$PSScriptRoot/../lib/Users.ps1";
     . "$PSScriptRoot/../Types/WindowsInstallerAction.ps1";
-    . "$PSScriptRoot/../../Common/Scripts/Config.ps1";
-    . "$PSScriptRoot/../../Common/Scripts/Operations.ps1";
-    . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
-    . "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1";
+    . "$PSScriptRoot/../../lib/Config.ps1";
+    . "$PSScriptRoot/../../lib/Operations.ps1";
+    . "$PSScriptRoot/../../lib/Scripting.ps1";
+    . "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
     . "$PSScriptRoot/../../Common/Types/InstallerAction.ps1";
 
     <#

scripts/Windows/OS/Setup.ps1

@@ -1,10 +1,10 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
+. "$PSScriptRoot/../../lib/Scripting.ps1";
 
 function Start-Setup {
     param($ConfigurationName)
-    . "$PSScriptRoot/../../Common/Scripts/Config.ps1";
-    . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
+    . "$PSScriptRoot/../../lib/Config.ps1";
+    . "$PSScriptRoot/../../lib/Scripting.ps1";
     $Global:InformationPreference = "Continue";
     $Global:ErrorActionPreference = "Inquire";
     $env:CONFIG_NAME ??= $ConfigurationName;

scripts/Windows/Software/aliae/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `

scripts/Windows/Software/chocolatey/Main.ps1

@@ -1,6 +1,6 @@
 using namespace Microsoft.Win32;
 
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1";
 
 Start-SoftwareInstaller -Force @args `

scripts/Windows/Software/discord/Main.ps1

@@ -1,6 +1,6 @@
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../Scripts/System.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../lib/System.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `

scripts/Windows/Software/ext4fsd/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller -Force @args `

scripts/Windows/Software/firefox/Main.ps1

@@ -1,6 +1,6 @@
-. "$PSScriptRoot/../../Scripts/AppAssociations.ps1";
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/AppAssociations.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 Start-SoftwareInstaller @args `
         -Installer {

scripts/Windows/Software/git/Main.ps1

@@ -1,6 +1,6 @@
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Config.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Config.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `

scripts/Windows/Software/lghub/Main.ps1

@@ -1,7 +1,7 @@
 & {
-    . "$PSScriptRoot/../../Scripts/Restoration.ps1";
-    . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-    . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+    . "$PSScriptRoot/../../lib/Restoration.ps1";
+    . "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+    . "$PSScriptRoot/../../../lib/Software.ps1";
     $configPath = "$env:LocalAppData/LGHUB";
 
     <#

scripts/Windows/Software/maniaplanet/Main.ps1

@@ -1,8 +1,8 @@
 & {
-    . "$PSScriptRoot/../../Scripts/Restoration.ps1";
-    . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-    . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
-    . "$PSScriptRoot/../../../Common/Scripts/System.ps1";
+    . "$PSScriptRoot/../../lib/Restoration.ps1";
+    . "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+    . "$PSScriptRoot/../../../lib/Software.ps1";
+    . "$PSScriptRoot/../../../lib/System.ps1";
     $path = "$HOME/Documents/ManiaPlanet";
 
     Start-SoftwareInstaller @args `

scripts/Windows/Software/msedge-redirect/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 Start-SoftwareInstaller @args `
     -Installer {

scripts/Windows/Software/nextcloud/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../Scripts/PowerManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/PowerManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 
 & {
     <#

scripts/Windows/Software/nvs/Main.ps1

@@ -1,8 +1,8 @@
 using namespace System.Security.AccessControl;
 using namespace System.Security.Principal;
 
-. "$PSScriptRoot/../../Scripts/Security.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/Security.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `

scripts/Windows/Software/oh-my-posh/Main.ps1

@@ -1,5 +1,5 @@
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
-. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../lib/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../lib/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `