Configure the users during installation
This commit is contained in:
parent
e44ef57825
commit
de64f0e4cb
|
@ -35,15 +35,15 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
and sudo pkgfile --update
|
and sudo pkgfile --update
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../../Common/Software/bash/main.fish" $action
|
and source "$dir/../../Common/Software/bash/main.fish" $argv
|
||||||
and source "$dir/../Software/openssh/main.fish" $action
|
and source "$dir/../Software/openssh/main.fish" $argv
|
||||||
and source "$dir/../Software/vim/main.fish" $action
|
and source "$dir/../Software/vim/main.fish" $argv
|
||||||
and source "$dir/../Software/git/main.fish" $action
|
and source "$dir/../Software/git/main.fish" $argv
|
||||||
and source "$dir/../Software/zoxide/main.fish" $action
|
and source "$dir/../Software/zoxide/main.fish" $argv
|
||||||
and source "$dir/../Software/logo-ls/main.fish" $action
|
and source "$dir/../Software/logo-ls/main.fish" $argv
|
||||||
|
|
||||||
# GRUB Shenanigans - if that's not essential I don't know what is!
|
# 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
|
end
|
||||||
|
|
||||||
and if collectionActive common
|
and if collectionActive common
|
||||||
|
@ -54,12 +54,12 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
terminal-parrot
|
terminal-parrot
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/aliae/main.fish" $action
|
and source "$dir/../Software/aliae/main.fish" $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
and if collectionActive desktopExperience
|
and if collectionActive desktopExperience
|
||||||
source "$dir/../Software/KDE/main.fish" $action
|
source "$dir/../Software/KDE/main.fish" $argv
|
||||||
and source "$dir/../Software/sddm/main.fish" $action
|
and source "$dir/../Software/sddm/main.fish" $argv
|
||||||
|
|
||||||
and if $isInstall
|
and if $isInstall
|
||||||
yayinst \
|
yayinst \
|
||||||
|
@ -127,13 +127,13 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
end
|
end
|
||||||
|
|
||||||
# Internet Access
|
# Internet Access
|
||||||
and source "$dir/../Software/Firefox/main.fish" $action
|
and source "$dir/../Software/Firefox/main.fish" $argv
|
||||||
and source "$dir/../Software/brave/main.fish" $action
|
and source "$dir/../Software/brave/main.fish" $argv
|
||||||
and source "$dir/../Software/Pennywise/main.fish" $action
|
and source "$dir/../Software/Pennywise/main.fish" $argv
|
||||||
|
|
||||||
# Virtualization
|
# Virtualization
|
||||||
and source "$dir/../Software/waydroid/main.fish" $action
|
and source "$dir/../Software/waydroid/main.fish" $argv
|
||||||
and source "$dir/../Software/Virtual Machine Manager/main.fish" $action
|
and source "$dir/../Software/Virtual Machine Manager/main.fish" $argv
|
||||||
|
|
||||||
and if collectionActive coding
|
and if collectionActive coding
|
||||||
if $isInstall
|
if $isInstall
|
||||||
|
@ -142,7 +142,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
godot-mono
|
godot-mono
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/vscode/main.fish" $action
|
and source "$dir/../Software/vscode/main.fish" $argv
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
tnef
|
tnef
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/IcedTea/main.fish" $action
|
and source "$dir/../Software/IcedTea/main.fish" $argv
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
yayinst nextcloud-client
|
yayinst nextcloud-client
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/rclone/main.fish" $action
|
and source "$dir/../Software/rclone/main.fish" $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
and if collectionActive socialMedia && $isInstall
|
and if collectionActive socialMedia && $isInstall
|
||||||
|
@ -238,7 +238,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
) esbonio
|
) esbonio
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/n/main.fish" $action
|
and source "$dir/../Software/n/main.fish" $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
and if collectionActive python
|
and if collectionActive python
|
||||||
|
@ -249,7 +249,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
|
||||||
python-pipenv
|
python-pipenv
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/pyenv/main.fish" $action
|
and source "$dir/../Software/pyenv/main.fish" $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
and if collectionActive gaming
|
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
|
and sudo flatpak install -y flathub com.usebottles.bottles
|
||||||
end
|
end
|
||||||
|
|
||||||
and source "$dir/../Software/Lutris/main.fish" $action
|
and source "$dir/../Software/Lutris/main.fish" $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
and if collectionActive essential && $isInstall
|
and if collectionActive essential && $isInstall
|
||||||
|
|
|
@ -35,6 +35,7 @@ else
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
set -l deployScript (getDeploymentScript)
|
||||||
runHook initialize || true
|
runHook initialize || true
|
||||||
and runHook installOS || true
|
and runHook installOS || true
|
||||||
|
|
||||||
|
@ -43,10 +44,17 @@ else
|
||||||
end
|
end
|
||||||
|
|
||||||
and runHook installSoftware || begin
|
and runHook installSoftware || begin
|
||||||
set -l script (getDeploymentScript)
|
if [ -n "$deployScript" ]
|
||||||
|
source $deployScript
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if [ -n "$script" ]
|
runHook initializeUsers || begin
|
||||||
source $script
|
if [ -n "$deployScript" ]
|
||||||
|
source "$dir/../Scripts/config.fish"
|
||||||
|
for name in (getUsers | jq '.[]' --raw-output0 | string split0)
|
||||||
|
source $deployScript userConfig $name
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue