diff --git a/scripts/Arch/OS/install.fish b/scripts/Arch/OS/install.fish index c46834c2..573da249 100755 --- a/scripts/Arch/OS/install.fish +++ b/scripts/Arch/OS/install.fish @@ -21,7 +21,8 @@ begin and yayinst \ linux-headers \ - pacman-contrib + pacman-contrib \ + yq end source "$dir/../../Common/OS/install.fish" diff --git a/scripts/Arch/Scripts/deploy.fish b/scripts/Arch/Scripts/deploy.fish index f1b7e909..30056674 100644 --- a/scripts/Arch/Scripts/deploy.fish +++ b/scripts/Arch/Scripts/deploy.fish @@ -21,7 +21,6 @@ function deploySoftware -d "Deploys a the specified software action" -a action neofetch \ bash-completion \ wget \ - oh-my-posh-bin \ screen \ tmux \ htop \ @@ -37,6 +36,8 @@ function deploySoftware -d "Deploys a the specified software action" -a action and source "$dir/../../Common/Software/bash/main.fish" $argv and source "$dir/../Software/sudo/main.fish" $argv + and source "$dir/../Software/aliae/main.fish" $argv + and source "$dir/../Software/Oh My Posh/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 @@ -54,8 +55,6 @@ function deploySoftware -d "Deploys a the specified software action" -a action btop \ terminal-parrot end - - and source "$dir/../Software/aliae/main.fish" $argv end and if collectionActive desktopExperience diff --git a/scripts/Arch/Software/Oh My Posh/main.fish b/scripts/Arch/Software/Oh My Posh/main.fish new file mode 100755 index 00000000..f2a697ad --- /dev/null +++ b/scripts/Arch/Software/Oh My Posh/main.fish @@ -0,0 +1,20 @@ +#!/bin/env fish +begin + set -l dir (status dirname) + set -l base "$dir/../../../Common/Software/Oh My Posh/main.fish" + source "$dir/../../Scripts/software.fish" + + function installSW + yayinst oh-my-posh-bin + end + + function configureSW -V base + fish "$base" configure + end + + function userConfig -S -V base -a name + fish "$base" userConfig $argv + end + + runInstaller $argv +end diff --git a/scripts/Common/Software/Oh My Posh/main.fish b/scripts/Common/Software/Oh My Posh/main.fish new file mode 100644 index 00000000..88304b9b --- /dev/null +++ b/scripts/Common/Software/Oh My Posh/main.fish @@ -0,0 +1,31 @@ +#!/bin/env fish +begin + set -l dir (status dirname) + source "$dir/../../Scripts/software.fish" + + function configureSW -V dir + source "$dir/../bash/profile.fish" + source "$dir/../fish/profile.fish" + + begin + printf %s\n \ + 'set -x POSH_THEME $POSH_THEME' \ + "oh-my-posh init fish | source" \ + "oh-my-posh completion fish | source" + end | installFishProfile "oh-my-posh" + + begin + printf %s\n \ + 'eval "$(oh-my-posh init bash)"' \ + 'eval "$(oh-my-posh completion bash)"' + end | installBashProfile "oh-my-posh" + + sudo -HE pwsh "$dir/Manage.ps1" Configure + end + + function userConfig -S -V dir -a name + pwsh -CommandWithArgs '& $args[0] ConfigureUser @{ name=$args[1]; }' "$dir/Manage.ps1" $name + end + + runInstaller $argv +end