Call software scripts using individual fish commands

scripts/Arch/Software/Firefox/main.fish

@@ -2,11 +2,10 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/Firefox/main.fish"
 
     function installSW
         yayinst firefox
-        configureSW
+        fish "$dir/../../../Common/Software/Firefox/main.fish" configure
     end
 
     runInstaller $argv

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
         pacinst \
@@ -10,7 +9,7 @@ begin
             efibootmgr \
             os-prober
 
-        configureSW
+        fish "$dir/../../../Common/Software/GRUB/main.fish" configure
     end
 
     runInstaller $argv

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

@@ -21,7 +21,7 @@ begin
     function configureSW -V dir
         sudo systemctl enable --now libvirtd
         sudo systemctl enable --now virtlogd
-        source "$dir/../../../Common/Software/Virtual Machine Manager/main.fish" configure
+        fish "$dir/../../../Common/Software/Virtual Machine Manager/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/aliae/main.fish

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

scripts/Arch/Software/brave/main.fish

@@ -10,7 +10,7 @@ begin
             # brave-nightly-bin
         )
 
-        configureSW
+        fish "$dir/../../../Common/Software/brave/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/git/main.fish

@@ -13,7 +13,7 @@ begin
             gitflow-fishcompletion-avh \
             gitflow-zshcompletion-avh
 
-        and configureSW
+        and fish "$dir/../../../Common/Software/git/main.fish" configure
     end
 
     runInstaller $argv

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

@@ -38,7 +38,7 @@ begin
 
     function configureSW -V dir
         sudo systemctl enable --now nix-daemon
-        source "$dir/../../../Common/Software/logo-ls/main.fish" configure
+        fish "$dir/../../../Common/Software/logo-ls/main.fish" configure
     end
 
     runInstaller $argv

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

@@ -2,11 +2,10 @@
 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
+        fish "$dir/../../../Common/Software/minegrub-theme/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/nix/main.fish

@@ -13,7 +13,7 @@ begin
 
     function configureSW -V dir
         sudo systemctl enable --now nix-daemon
-        source "$dir/../../../Common/Software/nix/main.fish" configure
+        fish "$dir/../../../Common/Software/nix/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/pyenv/main.fish

@@ -5,7 +5,7 @@ begin
 
     function installSW
         yayinst pyenv
-        source "$dir/../../../Common/Software/pyenv/main.fish" configure
+        fish "$dir/../../../Common/Software/pyenv/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/rclone/main.fish

@@ -8,7 +8,7 @@ begin
         yayinst \
             rclone
 
-        configureSW
+        fish "$dir/../../../Common/Software/rclone/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/vim/main.fish

@@ -13,7 +13,7 @@ begin
             ) vim-wayland-clipboard-git \
             wl-clipboard
 
-        and configureSW
+        and fish "$dir/../../../Common/Software/vim/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/vscode/main.fish

@@ -26,7 +26,7 @@ begin
             end
         end
 
-        source "$dir/../../../Common/Software/vscode/main.fish" configure
+        fish "$dir/../../../Common/Software/vscode/main.fish" configure
     end
 
     runInstaller $argv

scripts/Arch/Software/zoxide/main.fish

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

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

@@ -8,7 +8,7 @@ begin
             's/^#\?\(GRUB_THEME=\).*$/\1"\/usr\/share\/grub\/themes\/minegrub\/minegrub\/theme.txt"/' \
             /etc/default/grub
 
-        source "$dir/../GRUB/main.fish" configure
+        fish "$dir/../GRUB/main.fish" configure
     end
 
     runInstaller $argv

scripts/Common/Software/pyenv/main.fish

@@ -2,7 +2,6 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    source "$dir/../../../Common/Software/aliae/main.fish"
 
     function installSW
         curl https://pyenv.run | bash