Chain all commands

scripts/Arch/OS/install.fish

@@ -2,25 +2,25 @@
 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"
-        source "$dir/../Software/base-devel/main.fish"
-        source "$dir/../Software/pacman/main.fish"
-        source "$dir/../Software/yay/main.fish"
+        and source "$dir/../Scripts/software.fish"
+        and source "$dir/../Software/base-devel/main.fish"
+        and source "$dir/../Software/pacman/main.fish"
+        and source "$dir/../Software/yay/main.fish"
 
-        yayinst \
+        and yayinst \
             pacman-contrib \
             powershell-bin
     end
 
-    function getDeploymentScript -V dir
-        echo "$dir/../Scripts/deploy.fish";
-    end
-
     source "$dir/../../Common/OS/install.fish"
 end

scripts/Arch/Scripts/deploy.fish

@@ -7,7 +7,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
     end
 
     set -l isInstall (
-        if [ "$action" -eq "install" ]
+        if [ "$action" = "install" ]
             echo true
         else
             echo false
@@ -32,21 +32,21 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 sl \
                 rar
 
-            sudo pkgfile --update
+            and sudo pkgfile --update
         end
 
-        source "$dir/../../Common/Software/bash/main.fish" $action
-        source "$dir/../Software/openssh/main.fish" $action
-        source "$dir/../Software/vim/main.fish" $action
-        source "$dir/../Software/git/main.fish" $action
-        source "$dir/../Software/zoxide/main.fish" $action
-        source "$dir/../Software/logo-ls/main.fish" $action
+        and source "$dir/../../Common/Software/bash/main.fish" $action
+        and source "$dir/../Software/openssh/main.fish" $action
+        and source "$dir/../Software/vim/main.fish" $action
+        and source "$dir/../Software/git/main.fish" $action
+        and source "$dir/../Software/zoxide/main.fish" $action
+        and source "$dir/../Software/logo-ls/main.fish" $action
 
         # GRUB Shenanigans - if that's not essential I don't know what is!
-        source "$dir/../Software/minegrub-theme/main.fish" $action
+        and source "$dir/../Software/minegrub-theme/main.fish" $action
     end
 
-    if collectionActive common
+    and if collectionActive common
         if $isInstall
             yayinst \
                 tldr \
@@ -54,11 +54,14 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 terminal-parrot
         end
 
-        source "$dir/../Software/aliae/main.fish" $action
+        and source "$dir/../Software/aliae/main.fish" $action
     end
 
-    if collectionActive desktopExperience
-        if $isInstall
+    and if collectionActive desktopExperience
+        source "$dir/../Software/KDE/main.fish" $action
+        and source "$dir/../Software/sddm/main.fish" $action
+
+        and if $isInstall
             yayinst \
                 maliit-keyboard \
                 dconf-editor \
@@ -67,20 +70,20 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 ) xdg-desktop-portal-gtk
 
             # Fonts
-            yayinst \
+            and yayinst \
                 ttf-cascadia-code-nerd \
                 ttf-ms-win11-auto \
                 otf-cascadia-code \
                 ttf-droid
 
             # Password Management
-            yayinst \
+            and yayinst \
                 bitwarden \
                 keepass \
-                keepasscx
+                keepassxc
 
             # Tools
-            yayinst \
+            and yayinst \
                 android-tools \
                 blackbox-terminal \
                 cpu-x \
@@ -90,32 +93,32 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 linux-wifi-hotspot
 
             # Remote Access
-            yayinst \
+            and yayinst \
                 remmina (
                     # RDP support for Remmina
                 ) freerdp
 
             # Creativity
-            yayinst \
+            and yayinst \
                 gimp \
                 inkscape
 
             # Office stuff
-            yayinst \
+            and yayinst \
                 libreoffice-fresh \
                 naps2-bin \
                 pdfarranger \
                 protonmail-bridge \
                 thunderbird
 
-            yayinst \
+            and yayinst \
                 texlive \
                 texlive-langgerman
 
             # Virtualization
-            yayinst propertree-git # mac .plist config file editor
+            and yayinst propertree-git # mac .plist config file editor
 
-            if collectionActive school
+            and if collectionActive school
                 yayinst \
                     teams-for-linux \
                     xournalpp-git \
@@ -123,46 +126,44 @@ function deploySoftware -d "Deploys a the specified software action" -a action
             end
         end
 
-        source "$dir/../Software/KDE/main.fish" $action
-        source "$dir/../Software/sddm/main.fish" $action
-
         # Internet Access
-        source "$dir/../Software/Firefox/main.fish" $action
-        source "$dir/../Software/brave/main.fish" $action
-        source "$dir/../Software/Pennywise/main.fish" $action
+        and source "$dir/../Software/Firefox/main.fish" $action
+        and source "$dir/../Software/brave/main.fish" $action
+        and source "$dir/../Software/Pennywise/main.fish" $action
 
         # Virtualization
-        source "$dir/../Software/waydroid/main.fish" $action
-        source "$dir/../Software/Virtual Machine Manager/main.fish" $action
+        and source "$dir/../Software/waydroid/main.fish" $action
+        and source "$dir/../Software/Virtual Machine Manager/main.fish" $action
 
-        if collectionActive coding
+        and if collectionActive coding
             if $isInstall
                 yayinst \
                     devdocs-desktop \
-                    godot-mono-bin
+                    godot-mono
             end
 
-            source "$dir/../Software/vscode/main.fish" $action
+            and source "$dir/../Software/vscode/main.fish" $action
         end
     end
 
-    if collectionActive server
+    and if collectionActive server
     else
         if $isInstall
             # Energy Saving
             yayinst power-profiles-daemon
-            sudo systemctl enable --now power-profiles-daemon
+            and sudo systemctl enable --now power-profiles-daemon
 
             # Networking
-            yayinst \
-                network-manager-openvpn \
-                network-manager-openconnect \
-                protonvpn
+            and yayinst \
+                networkmanager-openvpn \
+                networkmanager-openconnect \
+                proton-vpn-gtk-app \
+                protonvpn-cli-community
         end
 
-        if collectionActive common
+        and if collectionActive common
             if $isInstall
-                yayinst \
+                and yayinst \
                     img2pdf \
                     numbat-bin \
                     nvtop \
@@ -170,52 +171,56 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                     tnef
             end
 
-            source "$dir/../Software/IcedTea/main.fish" $action
+            and source "$dir/../Software/IcedTea/main.fish" $action
         end
     end
 
-    if collectionActive media && $isInstall
+    and if collectionActive media && $isInstall
         yayinst \
             ytmdesktop-bin \
             netflix \
             spotube-bin \
             stremio \
-            tidal-dl \
             tidal-hifi-bin \
             nuclear-player-bin \
             audius-client-bin
+
+        and yayinst tidal-dl || true
     end
 
-    if collectionActive fileSync
+    and if collectionActive fileSync
         if $isInstall
             yayinst nextcloud-client
         end
 
-        source "$dir/../Software/rclone/main.fish" $action
+        and source "$dir/../Software/rclone/main.fish" $action
     end
 
-    if collectionActive socialMedia
+    and if collectionActive socialMedia && $isInstall
+
         yayinst \
             signal-desktop \
-            threema-desktop \
             vesktop-bin
+
+        yes y | yayinst threema-desktop
+        yes y | yayinst nodejs
     end
 
-    if collectionActive productivity && $isInstall
+    and if collectionActive productivity && $isInstall
         yayinst \
             anki-bin
     end
 
-    if collectionActive school && $isInstall
+    and if collectionActive school && $isInstall
         yayinst \
             jdk17-temurin \
             gradle \
             jetbrains-toolbox
 
-        source "$dir/../../Common/Software/udev/ct-board.fish"
+        and source "$dir/../../Common/Software/udev/ct-board.fish"
     end
 
-    if collectionActive coding
+    and if collectionActive coding
         if $isInstall
             yayinst \
                 archiso \
@@ -230,10 +235,10 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 ) esbonio
         end
 
-        source "$dir/../Software/n/main.fish" $action
+        and source "$dir/../Software/n/main.fish" $action
     end
 
-    if collectionActive python
+    and if collectionActive python
         if $isInstall
             yayinst \
                 python \
@@ -241,10 +246,10 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 python-pipenv
         end
 
-        source "$dir/../Software/pyenv/main.fish" $action
+        and source "$dir/../Software/pyenv/main.fish" $action
     end
 
-    if collectionActive gaming
+    and if collectionActive gaming
         if $isInstall
             yayinst \
                 steam \
@@ -254,13 +259,13 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 supertux \
                 gamepad-tool-bin
 
-            flatpak install -y flathub com.usebottels.bottles
+            and flatpak install -y flathub com.usebottels.bottles
         end
 
-        source "$dir/../Software/Lutris/main.fish" $action
+        and source "$dir/../Software/Lutris/main.fish" $action
     end
 
-    if collectionActive essential && $isInstall
+    and if collectionActive essential && $isInstall
         yayinst bb
     end
 end

scripts/Arch/Software/Firefox/main.fish

@@ -5,6 +5,9 @@ begin
 
     function installSW -V dir
         yayinst firefox
+    end
+
+    function configureSW -V dir
         fish "$dir/../../../Common/Software/Firefox/main.fish" configure
     end
 

scripts/Arch/Software/IcedTea/main.fish

@@ -9,8 +9,6 @@ begin
 
         yayinst \
             icedtea-web
-
-        configureSW
     end
 
     function configureSW

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/Pennywise/main.fish

@@ -6,8 +6,6 @@ begin
     function installSW
         yayinst \
             pennywise-bin
-
-        configureSW
     end
 
     function configureSW

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

@@ -14,8 +14,6 @@ begin
             swtpm \
             lxc \
             virt-bootstrap-git
-
-        configureSW
     end
 
     function configureSW -V dir

scripts/Arch/Software/aliae/main.fish

@@ -3,10 +3,12 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW -V dir
+    function installSW
         yayinst \
             aliae-bin
+    end
 
+    function configureSW -V dir
         fish "$dir/../../../Common/Software/aliae/main.fish" configure
     end
 

scripts/Arch/Software/brave/main.fish

@@ -2,14 +2,15 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/brave/main.fish"
 
-    function installSW -V dir
+    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
 

scripts/Arch/Software/git/main.fish

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

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

@@ -32,12 +32,9 @@ begin
 
             rm -rf "$contextRoot"
         end
-
-        configureSW
     end
 
     function configureSW -V dir
-        sudo systemctl enable --now nix-daemon
         fish "$dir/../../../Common/Software/logo-ls/main.fish" configure
     end
 

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

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

scripts/Arch/Software/n/main.fish

@@ -3,8 +3,11 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW -V dir
+    function installSW
         yayinst nodejs-n
+    end
+
+    function configureSW -V dir
         sudo --preserve-env --set-home fish "$dir/../../../Common/Software/n/main.fish" configure
     end
 

scripts/Arch/Software/openssh/main.fish

@@ -7,8 +7,6 @@ begin
         yayinst \
             openssh \
             libfido2
-
-        source (status filename) configure
     end
 
     function configureSW

scripts/Arch/Software/pyenv/main.fish

@@ -3,8 +3,11 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW -V dir
+    function installSW
         yayinst pyenv
+    end
+
+    function configureSW -V dir
         fish "$dir/../../../Common/Software/pyenv/main.fish" configure
     end
 

scripts/Arch/Software/rclone/main.fish

@@ -4,10 +4,12 @@ begin
     source "$dir/../../Scripts/software.fish"
     source "$dir/../../../Common/Software/rclone/main.fish"
 
-    function installSW -V dir
+    function installSW
         yayinst \
             rclone
+    end
 
+    function configureSW -V dir
         fish "$dir/../../../Common/Software/rclone/main.fish" configure
     end
 

scripts/Arch/Software/sddm/main.fish

@@ -8,7 +8,6 @@ begin
         # yes | yayinst sddm-git
         # stable version
         yayinst sddm
-        configureSW
     end
 
     function configureSW -V dir

scripts/Arch/Software/vim/main.fish

@@ -4,7 +4,7 @@ begin
     source "$dir/../../Scripts/software.fish"
     source "$dir/../../../Common/Software/vim/main.fish"
 
-    function installSW -V dir
+    function installSW
         yayinst (
                 # Necessary for accessing clipboard in terminal: https://wiki.archlinux.org/title/Vim
             ) gvim \
@@ -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 fish "$dir/../../../Common/Software/vim/main.fish" configure
+
+    function configureSW -V dir
+        fish "$dir/../../../Common/Software/vim/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/vscode/main.fish

@@ -9,8 +9,6 @@ begin
             visual-studio-code-bin (
                 # Trash functionality
             ) gvfs
-
-        configureSW
     end
 
     function configureSW -V dir

scripts/Arch/Software/zoxide/main.fish

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

scripts/Common/OS/install.fish

@@ -26,10 +26,8 @@ if [ (id -u) -eq 0 ]
     
     and sudo --preserve-env="CONFIG_NAME" --user "$name" "$INSTALLER_SCRIPT"
     rm "$sudoConfig"
-    userdel -r "$name"
+    userdel -rf "$name"
 else
-    source "$dir/../Software/bash/main.fish"
-
     if not type -q getDeploymentScript
         function getDeploymentScript
             echo "No deployment script specified! No software will be installed." 1>&2
@@ -38,9 +36,9 @@ else
     end
 
     runHook initialize || true
-    runHook installOS || true
+    and runHook installOS || true
 
-    runHook addUsers || begin
+    and runHook addUsers || begin
         source "$dir/users.fish"
     end
 

scripts/Common/Scripts/Operations.ps1

@@ -248,13 +248,11 @@ $null = New-Module {
                             }
 
                             if ($module[1]) {
-                                $parameters = @{
-                                    allowPrerelease = $true;
-                                };
+                                $parameters = @("-AllowPrerelease");
                             }
 
                             if (-not (Test-PSModule $module[0])) {
-                                Install-Module -Scope AllUsers -AcceptLicense -Force -AllowClobber $module[0] @parameters;
+                                sudo pwsh -Command Install-Module -Scope AllUsers -AcceptLicense -Force -AllowClobber $module[0] @parameters;
                                 Import-Module $module[0];
                             }
                         }

scripts/Common/Scripts/config.fish

@@ -1,6 +1,6 @@
 #!/bin/env fish
 function isConfigured -S
-    set -q "$CONFIG_NAME"
+    set -q CONFIG_NAME
 end
 
 function getProfiles -S

scripts/Common/Scripts/eval-flake.fish

@@ -15,7 +15,7 @@ function evalFlake --argument-names config property
 
     if [ -n "$config" ]
         set config ".$config"
-        set _flag_apply "_: ($_flag_apply) ((import $(status dirname)/../../../lib/eval-attribute.nix) _)"
+        set _flag_apply "_: ($_flag_apply) ((import $(realpath --relative-to (pwd) "$(status dirname)/../../../lib/eval-attribute.nix")) _)"
     end
 
     PROPERTY="$property" \

scripts/Common/Scripts/software.fish

@@ -12,23 +12,17 @@ begin
     end
 
     function runInstaller -V dir -a action
+        source "$dir/config.fish"
+
         if [ -z "$action" ] || [ "$action" = "install" ]
             installSW $argv[2..]
-        else if [ "$action" = "configure" ]
-            configureSW $argv[2..]
-
-            source "$dir/config.fish"
-            set -l users (getUsers)
+            runInstaller "configure"
 
             if not isConfigured || [ "$USER" != (getConfig "valhalla.setupUser.name") ]
                 runInstaller userConfig
             end
-
-            for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
-                if [ "$name" != "$USER" ]
-                    runInstaller userConfig "$name"
-                end
-            end
+        else if [ "$action" = "configure" ]
+            configureSW $argv[2..]
         else if [ "$action" = "userConfig" ]
             set -l name $argv[2]
 

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

@@ -3,9 +3,6 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW
-    end
-
     function configureSW
         sudo virsh net-autostart default
 

scripts/Common/Software/aliae/main.fish

@@ -3,10 +3,6 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW
-        configureSW
-    end
-
     function configureSW -V dir
         source "$dir/../bash/profile.fish"
         source "$dir/../fish/profile.fish"

scripts/Common/Software/bash/main.fish

@@ -3,10 +3,6 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW
-        configureSW
-    end
-
     function configureSW -V dir
         begin
             printf %s\n \
@@ -16,7 +12,7 @@ begin
                 "do" \
                 'source "$file";' \
                 'done < <(find {/etc,~/.config}/bash/conf.d/* -print0 2> /dev/null);'
-        end | sudo tee -a /etc/skel/.bashrc &> /dev/null
+        end | sudo tee -a /etc/bash.bashrc &> /dev/null
     end
 
     runInstaller $argv

scripts/Common/Software/git/main.fish

@@ -3,84 +3,8 @@ begin
     set -l dir (status dirname)
     source "$(status dirname)/../../Scripts/software.fish"
 
-    function configureGit -S -V dir -a name
-        source "$dir/../../Scripts/config.fish"
-        set -l root "valhalla"
-        set -l user
-        set -l configArgs
-
-        function setConfig -S
-            sudo -u "$user" git config $configArgs $argv
-        end
-
-        if [ -z "$name" ]
-            set user "root"
-            set configArgs "--system"
-        else
-            set root "$root.users.$name"
-            set user "$name"
-            set configArgs "--global"
-            set -l displayName "$root.displayName"
-            set -l mailAddress "$root.mailAddress"
-
-            if isSet "$displayName"
-                setConfig user.name (getConfig "$displayName")
-            end
-
-            if isSet "$mailAddress"
-                setConfig user.email (getConfig "$mailAddress")
-            end
-        end
-
-        set -l branch "$root.git.defaultBranch"
-
-        if isSet "$branch"
-            setConfig init.defaultBranch (getConfig "$branch")
-        end
-
-        begin # Git Flow
-            set -l dir (mktemp -d)
-
-            begin
-                set -l key "$root.git.flow"
-                set -l mainKey "$key.mainBranch"
-                set -l devKey "$key.devBranch"
-
-                git -C "$dir" init
-                git -C "$dir" commit --allow-empty -m "Initial commit" > /dev/null
-                git -C "$dir" branch master || true &> /dev/null
-                git -C "$dir" branch main || true &> /dev/null
-                git -C "$dir" branch dev || true &> /dev/null
-                yes "" | git -C "$dir" flow init &> /dev/null
-
-                if isSet "$mainKey"
-                    sudo git -C "$dir" flow config set $configArgs master (getConfig "$mainKey") > /dev/null
-                else
-                    true
-                end
-
-                if isSet "$devKey"
-                    sudo git -C "$dir" flow config set $configArgs develop (getConfig "$devKey") > /dev/null
-                else
-                    true
-                end
-            end
-
-            rm -rf "$dir"
-        end
-
-        begin # Aliases
-            set -l key "$root.git.aliases"
-            set -l aliases (getConfig "$key" --json)
-
-            for name in (echo "$aliases" | jq 'keys[]' --raw-output0 | string split0)
-                setConfig "alias.$name" (getConfig "$key.$name")
-            end
-        end
-    end
-
     function configureSW -S -V dir
-        configureGit
+        pwsh "$dir/Manage.ps1" Configure
     end
 
     function userConfig -S -V dir -a name

scripts/Common/Software/n/main.fish

@@ -5,7 +5,6 @@ begin
 
     function installSW
         npm install --global n
-        configureSW
     end
 
     function configureSW

scripts/Common/Software/vim/main.fish

@@ -3,10 +3,6 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW
-        configureSW
-    end
-
     function configureSW
         set -l configFile /etc/vimrc
         set -l indicator "set clipboard"
@@ -14,8 +10,6 @@ begin
         if not grep "\b$indicator\b" "$configFile" > /dev/null
             # As described in https://wiki.archlinux.org/title/Vim#Clipboard
             echo "$indicator+=unnamed,unnamedplus" | sudo tee "$configFile" > /dev/null;
-        else
-            true
         end
     end
 

scripts/Common/Software/zoxide/main.fish

@@ -3,10 +3,6 @@ begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
 
-    function installSW
-        configureSW
-    end
-
     function configureSW -V dir
         source "$dir/../bash/profile.fish"
         source "$dir/../fish/profile.fish"