manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactor the software install workflow

Browse source
This commit is contained in:
Manuel Thalmann 2024-09-13 14:47:07 +02:00
parent 0ebca3e82a
commit a7be9fa736
25 changed files with 41 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/Arch/Software/Firefox/main.fish
View file

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

2
scripts/Arch/Software/IcedTea/main.fish
View file

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

2
scripts/Arch/Software/KDE/main.fish
View file

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

2
scripts/Arch/Software/Pennywise/main.fish
View file

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

2
scripts/Arch/Software/Virtual Machine Manager/main.fish
View file

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

4
scripts/Arch/Software/aliae/main.fish
View file

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

4
scripts/Arch/Software/brave/main.fish
View file

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

6
scripts/Arch/Software/git/main.fish
View file

@ -3,7 +3,7 @@ begin
set -l dir (status dirname) set -l dir (status dirname)
source "$dir/../../Scripts/software.fish" source "$dir/../../Scripts/software.fish"
function installSW -V dir function installSW
yayinst \ yayinst \
git \ git \
git-lfs \ git-lfs \
@ -11,8 +11,10 @@ begin
gitflow-bashcompletion-avh \ gitflow-bashcompletion-avh \
gitflow-fishcompletion-avh \ gitflow-fishcompletion-avh \
gitflow-zshcompletion-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 end
runInstaller $argv runInstaller $argv

2
scripts/Arch/Software/logo-ls/main.fish
View file

@ -32,8 +32,6 @@ begin
rm -rf "$contextRoot" rm -rf "$contextRoot"
end end
configureSW
end end
function configureSW -V dir function configureSW -V dir

5
scripts/Arch/Software/minegrub-theme/main.fish
View file

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

5
scripts/Arch/Software/n/main.fish
View file

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

2
scripts/Arch/Software/openssh/main.fish
View file

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

5
scripts/Arch/Software/pyenv/main.fish
View file

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

4
scripts/Arch/Software/rclone/main.fish
View file

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

1
scripts/Arch/Software/sddm/main.fish
View file

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

7
scripts/Arch/Software/vim/main.fish
View file

@ -4,7 +4,7 @@ begin
source "$dir/../../Scripts/software.fish" source "$dir/../../Scripts/software.fish"
source "$dir/../../../Common/Software/vim/main.fish" source "$dir/../../../Common/Software/vim/main.fish"
function installSW -V dir function installSW
yayinst ( yayinst (
# Necessary for accessing clipboard in terminal: https://wiki.archlinux.org/title/Vim # Necessary for accessing clipboard in terminal: https://wiki.archlinux.org/title/Vim
) gvim \ ) gvim \
@ -12,8 +12,11 @@ begin
# Add clipboard support for wayland: https://www.reddit.com/r/Fedora/comments/ax9p9t/comment/jjb4p7b/ # Add clipboard support for wayland: https://www.reddit.com/r/Fedora/comments/ax9p9t/comment/jjb4p7b/
) vim-wayland-clipboard-git \ ) vim-wayland-clipboard-git \
wl-clipboard 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 end
runInstaller $argv runInstaller $argv

2
scripts/Arch/Software/vscode/main.fish
View file

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

4
scripts/Arch/Software/zoxide/main.fish
View file

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

16
scripts/Common/Scripts/software.fish
View file

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

3
scripts/Common/Software/Virtual Machine Manager/main.fish
View file

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

4
scripts/Common/Software/aliae/main.fish
View file

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

4
scripts/Common/Software/bash/main.fish
View file

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

1
scripts/Common/Software/n/main.fish
View file

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

4
scripts/Common/Software/vim/main.fish
View file

@ -3,10 +3,6 @@ begin
set -l dir (status dirname) set -l dir (status dirname)
source "$dir/../../Scripts/software.fish" source "$dir/../../Scripts/software.fish"
function installSW
configureSW
end
function configureSW function configureSW
set -l configFile /etc/vimrc set -l configFile /etc/vimrc
set -l indicator "set clipboard" set -l indicator "set clipboard"

4
scripts/Common/Software/zoxide/main.fish
View file

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