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

Configure the users during installation

Browse source
This commit is contained in:
Manuel Thalmann 2024-09-13 17:36:29 +02:00
parent e44ef57825
commit de64f0e4cb
2 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
scripts/Arch/Scripts/deploy.fish
View file

@ -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
@ -192,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
@ -238,7 +238,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
@ -249,7 +249,7 @@ 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
@ -265,7 +265,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
and sudo 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

14
scripts/Common/OS/install.fish
View file

@ -35,6 +35,7 @@ else
end
end
set -l deployScript (getDeploymentScript)
runHook initialize || true
and runHook installOS || true
@ -43,10 +44,17 @@ else
end
and runHook installSoftware || begin
set -l script (getDeploymentScript)
if [ -n "$deployScript" ]
source $deployScript
end
end
if [ -n "$script" ]
source $script
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