From 2650eff42d77d652eec60296e91fefcf44c310ac Mon Sep 17 00:00:00 2001 From: askiiart Date: Sat, 20 Apr 2024 20:35:22 -0500 Subject: [PATCH] fix various things, format scripts --- daily-use-pcs/setup-git.bash | 2 ++ distro-specific.bash | 9 +++++---- do-everything.bash | 1 + dotfiles | 2 +- install-stuff/install-claws-mail.bash | 3 +-- install-stuff/install-fish.bash | 4 +--- install-stuff/install-librewolf.bash | 1 + install-stuff/install-misc.sh | 6 +++--- install-stuff/install-qemu-libvirt.bash | 1 + install-stuff/install-vesktop.bash | 4 ++-- install-stuff/install-vs-code.bash | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/daily-use-pcs/setup-git.bash b/daily-use-pcs/setup-git.bash index df15ee3..4b2bc56 100755 --- a/daily-use-pcs/setup-git.bash +++ b/daily-use-pcs/setup-git.bash @@ -28,6 +28,8 @@ elif command_exists "emerge"; then sudo echo Not yet supported, exiting... elif command_exists "apk"; then sudo apk add git +elif command_exists "xbps-install"; then + sudo xbps-install git else echo "Unsupported: unknown package manager and distro" fi diff --git a/distro-specific.bash b/distro-specific.bash index b6a816b..0090bdf 100755 --- a/distro-specific.bash +++ b/distro-specific.bash @@ -1,5 +1,4 @@ #!/usr/bin/env bash -set -e if [ $(whoami) == "root" ]; then echo "Run as a normal user, not root" exit 1 @@ -23,8 +22,8 @@ elif command_exists "pacman"; then cd $WD rm -rf yay yay -S noto-fonts-emoji --noconfirm --needed - sudo mkdir /usr/share/fonts/meslolgs - yay -S ttf-meslo-nerd-font-powerlevel10k --noconfirm --needed + #sudo mkdir /usr/share/fonts/meslolgs + #yay -S ttf-meslo-nerd-font-powerlevel10k --noconfirm --needed elif command_exists "zypp"; then echo "not yet implemented" elif command_exists "emerge"; then @@ -35,9 +34,11 @@ elif command_exists "xbps-install"; then sudo xbps-install NetworkManager dbus polkit polkit-gnome nano noto-fonts-emoji noto-fonts-cjk python3 python3-pip mkdir ~/Applications cd ~/Applications - curl -LO $(curl -s https://api.github.com/repos/TheAssassin/AppImageLauncher/releases/latest | grep "browser_download_url.*appimagelauncher_.*-x86_64.AppImage" | cut -d : -f 2,3 | tr -d \") -C - + curl -LO $(curl -s https://api.github.com/repos/TheAssassin/AppImageLauncher/releases/latest | grep "browser_download_url.*appimagelauncher-lite.*-x86_64.AppImage" | cut -d : -f 2,3 | tr -d \") -C - + chmod +x appimagelauncher-lite*-x86_64.AppImage cd - echo "AppImageLauncher is in ~/Applications, deal with it yourself or update this script" + sudo xbps-install void-repo-multilib void-repo-nonfree else echo "Unsupported: unknown package manager and distro" fi diff --git a/do-everything.bash b/do-everything.bash index 4ffb007..c54f96f 100755 --- a/do-everything.bash +++ b/do-everything.bash @@ -19,6 +19,7 @@ chmod 700 ./*.bash ./install-steam.bash ./install-vs-code.bash ./install-yt-music.bash +./install-fonts.bash cd .. cd ./dotfiles diff --git a/dotfiles b/dotfiles index 4bbfa11..ab89154 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 4bbfa111d57c72dffdac872278e4ac4bc6c6603d +Subproject commit ab891546112053b37bf2cacc682b9480d7670d0d diff --git a/install-stuff/install-claws-mail.bash b/install-stuff/install-claws-mail.bash index 07633d0..3774387 100755 --- a/install-stuff/install-claws-mail.bash +++ b/install-stuff/install-claws-mail.bash @@ -9,8 +9,7 @@ fi command_exists() { type "$1" &>/dev/null; } if command_exists "yay"; then - yay -S claws-mail python-gpgme nuspell aspell aspell-en - yay -S spamassassin + yay -S claws-mail python-gpgme nuspell aspell aspell-en spamassassin sudo systemctl enable --now spamassassin.service cd ~ git clone https://git.askiiart.net/askiiart/gpg-email-helper diff --git a/install-stuff/install-fish.bash b/install-stuff/install-fish.bash index 67ce51b..e15053e 100755 --- a/install-stuff/install-fish.bash +++ b/install-stuff/install-fish.bash @@ -13,7 +13,7 @@ if command_exists "apt-get"; then elif command_exists "yum"; then sudo yum install fish -y elif command_exists "pacman"; then - yay -S fish + pacman -S fish elif command_exists "zypp"; then # Untested sudo zypper install fish -y @@ -30,5 +30,3 @@ else fi chsh -s $(readlink -f $(which fish)) - -fish -c "tide configure --auto --style=Classic --prompt_colors='True color' --classic_prompt_color=Dark --show_time='24-hour format' --classic_prompt_separators=Vertical --powerline_prompt_heads=Sharp --powerline_prompt_tails=Flat --powerline_prompt_style='One line' --prompt_spacing=Compact --icons='Many icons' --transient=No" diff --git a/install-stuff/install-librewolf.bash b/install-stuff/install-librewolf.bash index 93f8c7b..9820893 100755 --- a/install-stuff/install-librewolf.bash +++ b/install-stuff/install-librewolf.bash @@ -41,6 +41,7 @@ elif command_exists "emerge"; then emaint -r librewolf sync elif command_exists "xbps-install"; then mkdir librewolf + cd librewolf curl $(curl -s https://api.github.com/repos/index-0/librewolf-void/releases/latest | grep "browser_download_url.*librewolf-.*.x86_64.xbps" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -LO sudo xbps-rindex -a librewolf-*.x86_64.xbps sudo xbps-install -R $PWD librewolf diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh index dbfb5c2..f051141 100755 --- a/install-stuff/install-misc.sh +++ b/install-stuff/install-misc.sh @@ -20,7 +20,7 @@ elif command_exists "dnf"; then sudo dnf copr enable g3tchoo/prismlauncher sudo dnf install prismlauncher-qt5 elif command_exists "yay"; then - yay -S kitty schildichat-desktop-bin digikam man-db neovim prismlauncher-qt5-bin progress --noconfirm --needed + yay -S kitty neovim gcc vlc ncdu gcolor3 rustup p7zip mosh krita podman podman-compose gajim progress yt-dlp genisoimage drawing clippy gnome-hexgl zstd iperf3 unzip schildichat-desktop-bin digikam man-db prismlauncher-qt5-bin progress --noconfirm --needed elif command_exists "zypp"; then # Untested sudo zypper install kitty -y @@ -30,10 +30,10 @@ elif command_exists "emerge"; then exit elif command_exists "apk"; then echo Not yet supported, exiting... -elif command_exists "xbps-install"; +elif command_exists "xbps-install"; then # missing: hexgl, drawing, clippy, schildichat, genisoimage # not included: libfreeglut, don't think that's required - sudo xbps-install kitty neovim gcc vlc ncdu gcolor3 rustup p7zip mosh krita podman podman-compose gajim progress yt-dlp zstd iperf3 + sudo xbps-install kitty neovim gcc vlc ncdu gcolor3 rustup p7zip mosh krita podman podman-compose gajim progress yt-dlp zstd iperf3 unzip cd ~/Applications curl -LO $(curl -s https://api.github.com/repos/SchildiChat/schildichat-desktop/releases/latest | grep "browser_download_url.*SchildiChat-.*.AppImage" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -C - cd - diff --git a/install-stuff/install-qemu-libvirt.bash b/install-stuff/install-qemu-libvirt.bash index 15e0ed9..77f41cb 100755 --- a/install-stuff/install-qemu-libvirt.bash +++ b/install-stuff/install-qemu-libvirt.bash @@ -29,6 +29,7 @@ elif command_exists "apk"; then elif command_exists "xbps-install"; then sudo xbps-install qemu libvirt virt-manager sudo usermod -aG libvirt $(whoami) + sudo ln -s /etc/sv/libvirtd/ /var/service/ else echo "Unsupported: unknown package manager and distro" fi diff --git a/install-stuff/install-vesktop.bash b/install-stuff/install-vesktop.bash index c80bb7c..6efe39e 100755 --- a/install-stuff/install-vesktop.bash +++ b/install-stuff/install-vesktop.bash @@ -14,11 +14,11 @@ elif command_exists "yum"; then curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "browser_download_url.*vesktop-.*.x86_64.rpm" | head --lines 1 | cut -d : -f 2,3 | tr -d \") sudo dnf install ./vesktop-*.rpm -y rm ./vesktop-*.rpm -elif command_exists "pacman"; then +elif command_exists "yay"; then yay -S vesktop-bin --noconfirm --needed elif command_exists "xbps-install"; then cd ~/Applications - curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "browser_download_url.*Vesktop-.*.AppImage" | head --lines 1 | cut -d : -f 2,3 | tr -d \") + curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "browser_download_url.*Vesktop-.*.AppImage" | tail --lines 1 | cut -d : -f 2,3 | tr -d \") cd - else echo "IDK, check the repo: https://github.com/Vencord/Vesktop" diff --git a/install-stuff/install-vs-code.bash b/install-stuff/install-vs-code.bash index 4e13d50..bd8bea1 100755 --- a/install-stuff/install-vs-code.bash +++ b/install-stuff/install-vs-code.bash @@ -9,7 +9,7 @@ command_exists() { type "$1" &>/dev/null; } if command_exists "apt-get"; then sudo apt-get install wget gpg - wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg + wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg sudo sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list' rm -f packages.microsoft.gpg