Fix rclone configuration script

scripts/Arch/Scripts/deploy.fish

@@ -35,15 +35,15 @@ function deploySoftware -d "Deploys a the specified software action" -a action
             and sudo pkgfile --update
         end
 
-        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
+        and source "$dir/../../Common/Software/bash/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" $action
+        and source "$dir/../Software/minegrub-theme/main.fish" $argv
     end
 
     and if collectionActive common
@@ -54,12 +54,12 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 terminal-parrot
         end
 
-        and source "$dir/../Software/aliae/main.fish" $action
+        and source "$dir/../Software/aliae/main.fish" $argv
     end
 
     and if collectionActive desktopExperience
-        source "$dir/../Software/KDE/main.fish" $action
-        and source "$dir/../Software/sddm/main.fish" $action
+        source "$dir/../Software/KDE/main.fish" $argv
+        and source "$dir/../Software/sddm/main.fish" $argv
 
         and if $isInstall
             yayinst \
@@ -127,13 +127,13 @@ function deploySoftware -d "Deploys a the specified software action" -a action
         end
 
         # Internet Access
-        and source "$dir/../Software/Firefox/main.fish" $action
-        and source "$dir/../Software/brave/main.fish" $action
-        and source "$dir/../Software/Pennywise/main.fish" $action
+        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" $action
-        and source "$dir/../Software/Virtual Machine Manager/main.fish" $action
+        and source "$dir/../Software/waydroid/main.fish" $argv
+        and source "$dir/../Software/Virtual Machine Manager/main.fish" $argv
 
         and if collectionActive coding
             if $isInstall
@@ -142,7 +142,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                     godot-mono
             end
 
-            and source "$dir/../Software/vscode/main.fish" $action
+            and source "$dir/../Software/vscode/main.fish" $argv
         end
     end
 
@@ -171,7 +171,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                     tnef
             end
 
-            and source "$dir/../Software/IcedTea/main.fish" $action
+            and source "$dir/../Software/IcedTea/main.fish" $argv
         end
     end
 
@@ -181,11 +181,10 @@ function deploySoftware -d "Deploys a the specified software action" -a action
             netflix \
             spotube-bin \
             stremio \
+            tidal-dl-ng \
             tidal-hifi-bin \
             nuclear-player-bin \
             audius-client-bin
-
-        and yayinst tidal-dl || true
     end
 
     and if collectionActive fileSync
@@ -193,7 +192,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
             yayinst nextcloud-client
         end
 
-        and source "$dir/../Software/rclone/main.fish" $action
+        and source "$dir/../Software/rclone/main.fish" $argv
     end
 
     and if collectionActive socialMedia && $isInstall
@@ -202,8 +201,13 @@ function deploySoftware -d "Deploys a the specified software action" -a action
             signal-desktop \
             vesktop-bin
 
-        yes y | yayinst threema-desktop
-        yes y | yayinst nodejs
+        and begin
+            yes y | runYay threema-desktop
+        end
+
+        and begin
+            yes y | runYay nodejs
+        end
     end
 
     and if collectionActive productivity && $isInstall
@@ -235,7 +239,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 ) esbonio
         end
 
-        and source "$dir/../Software/n/main.fish" $action
+        and source "$dir/../Software/n/main.fish" $argv
     end
 
     and if collectionActive python
@@ -246,23 +250,23 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 python-pipenv
         end
 
-        and source "$dir/../Software/pyenv/main.fish" $action
+        and source "$dir/../Software/pyenv/main.fish" $argv
     end
 
     and if collectionActive gaming
         if $isInstall
             yayinst \
                 steam \
-                chiaki \
+                chiaki-ng \
                 osu-lazer-bin \
                 libretro \
                 supertux \
                 gamepad-tool-bin
 
-            and flatpak install -y flathub com.usebottels.bottles
+            and flatpak install -y flathub com.usebottles.bottles
         end
 
-        and source "$dir/../Software/Lutris/main.fish" $action
+        and source "$dir/../Software/Lutris/main.fish" $argv
     end
 
     and if collectionActive essential && $isInstall

scripts/Arch/Scripts/software.fish

@@ -4,7 +4,10 @@ begin
     source "$dir/../../Common/Scripts/software.fish"
 
     function runYay -d "Run yay with pre-configured defaults"
-        yay --needed --answerclean=None --answerdiff=None -Syu $argv
+        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"
@@ -12,7 +15,10 @@ begin
     end
 
     function runPacman -d "Run pacman with pre-configured defaults"
-        sudo pacman --needed -Syu $argv
+        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"

scripts/Arch/Software/rclone/main.fish

@@ -1,6 +1,7 @@
 #!/bin/env fish
 begin
     set -l dir (status dirname)
+    set -l base "$dir/../../../Common/Software/rclone/main.fish"
     source "$dir/../../Scripts/software.fish"
     source "$dir/../../../Common/Software/rclone/main.fish"
 
@@ -9,8 +10,12 @@ begin
             rclone
     end
 
-    function configureSW -V dir
-        fish "$dir/../../../Common/Software/rclone/main.fish" configure
+    function configureSW -V base
+        fish "$base" configure
+    end
+
+    function userConfig -V base -a name
+        fish "$base" userConfig $argv
     end
 
     runInstaller $argv

scripts/Common/OS/install.fish

@@ -35,6 +35,7 @@ else
         end
     end
 
+    set -l deployScript (getDeploymentScript)
     runHook initialize || true
     and runHook installOS || true
 
@@ -42,15 +43,20 @@ else
         source "$dir/users.fish"
     end
 
-    runHook installSoftware || begin
-        set -l script (getDeploymentScript)
-
-        if [ -n "$script" ]
-            source $script
+    and runHook installSoftware || begin
+        if [ -n "$deployScript" ]
+            source $deployScript
         end
     end
 
-    runHook initializeConfig || true
+    runHook initializeUsers || begin
+        if [ -n "$deployScript" ]
+            source "$dir/../Scripts/config.fish"
+            for name in (getUsers | jq '.[]' --raw-output0 | string split0)
+                source $deployScript userConfig $name
+            end
+        end
+    end
 
-    runHook postInstall || true
+    and runHook postInstall || true
 end

scripts/Common/Software/rclone/main.fish

@@ -9,7 +9,7 @@ begin
 
     function userConfig -V dir -a name
         source "$dir/../../Scripts/config.fish"
-        set -l key "valhalla.users.$name.rclone.configurations"
+        set -l key "valhalla.linux.users.$name.rclone.configurations"
         set -l configs (getConfig "$key" --apply "builtins.attrNames" --json)
 
         if [ (echo "$configs" | jq "length") -gt 0 ]