Chain all commands

This commit is contained in:
Manuel Thalmann 2024-09-13 15:10:29 +02:00
parent 5b28e2da8b
commit 7818ad9065
3 changed files with 57 additions and 57 deletions

View file

@ -12,12 +12,12 @@ begin
or exit or exit
sudo systemctl enable --now nix-daemon sudo systemctl enable --now nix-daemon
source "$dir/../Scripts/software.fish" and source "$dir/../Scripts/software.fish"
source "$dir/../Software/base-devel/main.fish" and source "$dir/../Software/base-devel/main.fish"
source "$dir/../Software/pacman/main.fish" and source "$dir/../Software/pacman/main.fish"
source "$dir/../Software/yay/main.fish" and source "$dir/../Software/yay/main.fish"
yayinst \ and yayinst \
pacman-contrib \ pacman-contrib \
powershell-bin powershell-bin
end end

View file

@ -32,21 +32,21 @@ function deploySoftware -d "Deploys a the specified software action" -a action
sl \ sl \
rar rar
sudo pkgfile --update and sudo pkgfile --update
end end
source "$dir/../../Common/Software/bash/main.fish" $action and source "$dir/../../Common/Software/bash/main.fish" $action
source "$dir/../Software/openssh/main.fish" $action and source "$dir/../Software/openssh/main.fish" $action
source "$dir/../Software/vim/main.fish" $action and source "$dir/../Software/vim/main.fish" $action
source "$dir/../Software/git/main.fish" $action and source "$dir/../Software/git/main.fish" $action
source "$dir/../Software/zoxide/main.fish" $action and source "$dir/../Software/zoxide/main.fish" $action
source "$dir/../Software/logo-ls/main.fish" $action and source "$dir/../Software/logo-ls/main.fish" $action
# 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!
source "$dir/../Software/minegrub-theme/main.fish" $action and source "$dir/../Software/minegrub-theme/main.fish" $action
end end
if collectionActive common and if collectionActive common
if $isInstall if $isInstall
yayinst \ yayinst \
tldr \ tldr \
@ -54,14 +54,14 @@ function deploySoftware -d "Deploys a the specified software action" -a action
terminal-parrot terminal-parrot
end end
source "$dir/../Software/aliae/main.fish" $action and source "$dir/../Software/aliae/main.fish" $action
end end
if collectionActive desktopExperience and if collectionActive desktopExperience
source "$dir/../Software/KDE/main.fish" $action source "$dir/../Software/KDE/main.fish" $action
source "$dir/../Software/sddm/main.fish" $action and source "$dir/../Software/sddm/main.fish" $action
if $isInstall and if $isInstall
yayinst \ yayinst \
maliit-keyboard \ maliit-keyboard \
dconf-editor \ dconf-editor \
@ -70,20 +70,20 @@ function deploySoftware -d "Deploys a the specified software action" -a action
) xdg-desktop-portal-gtk ) xdg-desktop-portal-gtk
# Fonts # Fonts
yayinst \ and yayinst \
ttf-cascadia-code-nerd \ ttf-cascadia-code-nerd \
ttf-ms-win11-auto \ ttf-ms-win11-auto \
otf-cascadia-code \ otf-cascadia-code \
ttf-droid ttf-droid
# Password Management # Password Management
yayinst \ and yayinst \
bitwarden \ bitwarden \
keepass \ keepass \
keepassxc keepassxc
# Tools # Tools
yayinst \ and yayinst \
android-tools \ android-tools \
blackbox-terminal \ blackbox-terminal \
cpu-x \ cpu-x \
@ -93,32 +93,32 @@ function deploySoftware -d "Deploys a the specified software action" -a action
linux-wifi-hotspot linux-wifi-hotspot
# Remote Access # Remote Access
yayinst \ and yayinst \
remmina ( remmina (
# RDP support for Remmina # RDP support for Remmina
) freerdp ) freerdp
# Creativity # Creativity
yayinst \ and yayinst \
gimp \ gimp \
inkscape inkscape
# Office stuff # Office stuff
yayinst \ and yayinst \
libreoffice-fresh \ libreoffice-fresh \
naps2-bin \ naps2-bin \
pdfarranger \ pdfarranger \
protonmail-bridge \ protonmail-bridge \
thunderbird thunderbird
yayinst \ and yayinst \
texlive \ texlive \
texlive-langgerman texlive-langgerman
# Virtualization # Virtualization
yayinst propertree-git # mac .plist config file editor and yayinst propertree-git # mac .plist config file editor
if collectionActive school and if collectionActive school
yayinst \ yayinst \
teams-for-linux \ teams-for-linux \
xournalpp-git \ xournalpp-git \
@ -127,43 +127,43 @@ function deploySoftware -d "Deploys a the specified software action" -a action
end end
# Internet Access # Internet Access
source "$dir/../Software/Firefox/main.fish" $action and source "$dir/../Software/Firefox/main.fish" $action
source "$dir/../Software/brave/main.fish" $action and source "$dir/../Software/brave/main.fish" $action
source "$dir/../Software/Pennywise/main.fish" $action and source "$dir/../Software/Pennywise/main.fish" $action
# Virtualization # Virtualization
source "$dir/../Software/waydroid/main.fish" $action and source "$dir/../Software/waydroid/main.fish" $action
source "$dir/../Software/Virtual Machine Manager/main.fish" $action and source "$dir/../Software/Virtual Machine Manager/main.fish" $action
if collectionActive coding and if collectionActive coding
if $isInstall if $isInstall
yayinst \ yayinst \
devdocs-desktop \ devdocs-desktop \
godot-mono godot-mono
end end
source "$dir/../Software/vscode/main.fish" $action and source "$dir/../Software/vscode/main.fish" $action
end end
end end
if collectionActive server and if collectionActive server
else else
if $isInstall if $isInstall
# Energy Saving # Energy Saving
yayinst power-profiles-daemon yayinst power-profiles-daemon
sudo systemctl enable --now power-profiles-daemon and sudo systemctl enable --now power-profiles-daemon
# Networking # Networking
yayinst \ and yayinst \
networkmanager-openvpn \ networkmanager-openvpn \
networkmanager-openconnect \ networkmanager-openconnect \
proton-vpn-gtk-app \ proton-vpn-gtk-app \
protonvpn-cli-community protonvpn-cli-community
end end
if collectionActive common and if collectionActive common
if $isInstall if $isInstall
yayinst \ and yayinst \
img2pdf \ img2pdf \
numbat-bin \ numbat-bin \
nvtop \ nvtop \
@ -171,11 +171,11 @@ function deploySoftware -d "Deploys a the specified software action" -a action
tnef tnef
end end
source "$dir/../Software/IcedTea/main.fish" $action and source "$dir/../Software/IcedTea/main.fish" $action
end end
end end
if collectionActive media && $isInstall and if collectionActive media && $isInstall
yayinst \ yayinst \
ytmdesktop-bin \ ytmdesktop-bin \
netflix \ netflix \
@ -187,15 +187,15 @@ function deploySoftware -d "Deploys a the specified software action" -a action
audius-client-bin audius-client-bin
end end
if collectionActive fileSync and if collectionActive fileSync
if $isInstall if $isInstall
yayinst nextcloud-client yayinst nextcloud-client
end end
source "$dir/../Software/rclone/main.fish" $action and source "$dir/../Software/rclone/main.fish" $action
end end
if collectionActive socialMedia && $isInstall and if collectionActive socialMedia && $isInstall
yayinst \ yayinst \
signal-desktop \ signal-desktop \
vesktop-bin vesktop-bin
@ -204,21 +204,21 @@ function deploySoftware -d "Deploys a the specified software action" -a action
yes y | yayinst nodejs yes y | yayinst nodejs
end end
if collectionActive productivity && $isInstall and if collectionActive productivity && $isInstall
yayinst \ yayinst \
anki-bin anki-bin
end end
if collectionActive school && $isInstall and if collectionActive school && $isInstall
yayinst \ yayinst \
jdk17-temurin \ jdk17-temurin \
gradle \ gradle \
jetbrains-toolbox jetbrains-toolbox
source "$dir/../../Common/Software/udev/ct-board.fish" and source "$dir/../../Common/Software/udev/ct-board.fish"
end end
if collectionActive coding and if collectionActive coding
if $isInstall if $isInstall
yayinst \ yayinst \
archiso \ archiso \
@ -233,10 +233,10 @@ function deploySoftware -d "Deploys a the specified software action" -a action
) esbonio ) esbonio
end end
source "$dir/../Software/n/main.fish" $action and source "$dir/../Software/n/main.fish" $action
end end
if collectionActive python and if collectionActive python
if $isInstall if $isInstall
yayinst \ yayinst \
python \ python \
@ -244,10 +244,10 @@ function deploySoftware -d "Deploys a the specified software action" -a action
python-pipenv python-pipenv
end end
source "$dir/../Software/pyenv/main.fish" $action and source "$dir/../Software/pyenv/main.fish" $action
end end
if collectionActive gaming and if collectionActive gaming
if $isInstall if $isInstall
yayinst \ yayinst \
steam \ steam \
@ -257,13 +257,13 @@ function deploySoftware -d "Deploys a the specified software action" -a action
supertux \ supertux \
gamepad-tool-bin gamepad-tool-bin
sudo flatpak install -y flathub com.usebottles.bottles and sudo flatpak install -y flathub com.usebottles.bottles
end end
source "$dir/../Software/Lutris/main.fish" $action and source "$dir/../Software/Lutris/main.fish" $action
end end
if collectionActive essential && $isInstall and if collectionActive essential && $isInstall
yayinst bb yayinst bb
end end
end end

View file

@ -36,9 +36,9 @@ else
end end
runHook initialize || true runHook initialize || true
runHook installOS || true and runHook installOS || true
runHook addUsers || begin and runHook addUsers || begin
source "$dir/users.fish" source "$dir/users.fish"
end end