From 6199ce3d888af69030d6e7da51185f3349fa7af0 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Wed, 17 Apr 2024 21:41:40 -0500
Subject: [PATCH] Add void support, plus some other updates

---
 daily-use-pcs/setup-git.bash            |  3 +--
 distro-specific.bash                    |  8 ++++++++
 dotfiles                                |  2 +-
 install-stuff/install-claws-mail.bash   |  4 ++++
 install-stuff/install-fish.bash         |  4 ++++
 install-stuff/install-fonts.bash        | 20 ++++++++++++++------
 install-stuff/install-librewolf.bash    |  7 +++++++
 install-stuff/install-misc.sh           | 10 ++++++++--
 install-stuff/install-qemu-libvirt.bash |  3 +++
 install-stuff/install-steam.bash        |  5 ++++-
 install-stuff/install-vesktop.bash      |  2 ++
 install-stuff/install-vs-code.bash      |  2 ++
 install-stuff/install-yt-music.bash     |  4 ++++
 13 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/daily-use-pcs/setup-git.bash b/daily-use-pcs/setup-git.bash
index 29232f9..df15ee3 100755
--- a/daily-use-pcs/setup-git.bash
+++ b/daily-use-pcs/setup-git.bash
@@ -2,10 +2,9 @@
 # Exit if there's an error
 set -e
 # Modify constants as needed
-GITEA_URL="https://git.askiiart.net"
 GIT_NAME="askiiart"
 GIT_EMAIL="dev@askiiart.net"
-KEY_ID="02EFA1CE3C3E4AAD7A863AB8ED24985CA884CD61"
+KEY_ID="CFCF6723A8ED791C5FD25CB5858969DCCC2E792D"
 
 # Note: This waits until enter is pressed
 # read -p "Press Enter to continue" < /dev/tty
diff --git a/distro-specific.bash b/distro-specific.bash
index c2b7aa4..2af1af0 100755
--- a/distro-specific.bash
+++ b/distro-specific.bash
@@ -31,6 +31,14 @@ elif command_exists "emerge"; then
     echo "not yet implemented"
 elif command_exists "apk"; then
     echo "not yet implemented"
+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/DavidoTek/ProtonUp-Qt/releases/latest | grep "browser_download_url.*ProtonUp-Qt-.*-x86_64.AppImage" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -C -
+    cd -
+    echo "AppImageLauncher is in ~/Applications, deal with it yourself or update this script"
 else
     echo "Unsupported: unknown package manager and distro"
 fi
diff --git a/dotfiles b/dotfiles
index 274c0a3..4bbfa11 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 274c0a37d3669c18d73ecb5510b7778992cdaa51
+Subproject commit 4bbfa111d57c72dffdac872278e4ac4bc6c6603d
diff --git a/install-stuff/install-claws-mail.bash b/install-stuff/install-claws-mail.bash
index fa09cfa..07633d0 100755
--- a/install-stuff/install-claws-mail.bash
+++ b/install-stuff/install-claws-mail.bash
@@ -21,6 +21,10 @@ elif command_exists "dnf"; then
     cd ~
     git clone https://git.askiiart.net/askiiart/gpg-email-helper
     cd -
+elif command_exists "xbps-install"; then
+    sudo xbps-install claws-mail spamassassin
+    ln -s /etc/sv/spamd /var/service/
+    sv start spamd
 else
     echo "IDK"
 fi
diff --git a/install-stuff/install-fish.bash b/install-stuff/install-fish.bash
index ac36d7d..67ce51b 100755
--- a/install-stuff/install-fish.bash
+++ b/install-stuff/install-fish.bash
@@ -22,9 +22,13 @@ elif command_exists "emerge"; then
     exit
 elif command_exists "apk"; then
     sudo apk add fish
+elif command_exists "xbps-install"; then
+    sudo xbps-install fish-shell -y
 else
     echo "Unsupported: unknown package manager and distro"
     exit
 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-fonts.bash b/install-stuff/install-fonts.bash
index 2210c28..9190458 100755
--- a/install-stuff/install-fonts.bash
+++ b/install-stuff/install-fonts.bash
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+command_exists() { type "$1" &>/dev/null; }
+
+# on void i could totally install the nerd fonts via `xbps-install nerd-fonts-otf` but i am NOT installing an extra 1.45-ish GB of the rest of the nerd fonts along with it
+# stock firacode is available via `font-firacode` though
 sudo mkdir /usr/share/fonts/firacode
 mkdir ./tmp-fonts
 cd ./tmp-fonts
@@ -8,12 +12,16 @@ curl $(curl -s https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest
 unzip FiraCode.zip
 sudo mv FiraCodeNerdFont*.ttf /usr/share/fonts/firacode/
 
-sudo mkdir /usr/share/fonts/atkinson-hyperlegible
-curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Regular.ttf
-curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Bold.ttf
-curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Italic.ttf
-curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-BoldItalic.ttf
-sudo mv AtkinsonHyperlegible*.ttf /usr/share/fonts/atkinson-hyperlegible/
+if command_exists "xbps-install"; then
+    sudo xbps-install font-atkinson-hyperlegible-otf
+else
+    sudo mkdir /usr/share/fonts/atkinson-hyperlegible
+    curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Regular.ttf
+    curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Bold.ttf
+    curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Italic.ttf
+    curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-BoldItalic.ttf
+    sudo mv AtkinsonHyperlegible*.ttf /usr/share/fonts/atkinson-hyperlegible/
+fi
 
 cd -
 rm -rf ./tmp-fonts
diff --git a/install-stuff/install-librewolf.bash b/install-stuff/install-librewolf.bash
index 44c9434..93f8c7b 100755
--- a/install-stuff/install-librewolf.bash
+++ b/install-stuff/install-librewolf.bash
@@ -39,6 +39,13 @@ elif command_exists "emerge"; then
     # Untested
     sudo eselect repository add librewolf git https://codeberg.org/librewolf/gentoo.git
     emaint -r librewolf sync
+elif command_exists "xbps-install"; then
+    mkdir 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
+    cd -
+    rm -rf librewolf
 else
     echo "Figure it out yourself, or get the AppImage from here: https://gitlab.com/librewolf-community/browser/appimage/-/releases"
 fi
diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh
index 675d702..f2c248c 100755
--- a/install-stuff/install-misc.sh
+++ b/install-stuff/install-misc.sh
@@ -6,19 +6,21 @@ if [ $(whoami) == "root" ]; then
     exit 1
 fi
 
+# only fedora is up-to-date
+
 command_exists() { type "$1" &>/dev/null; }
 
 if command_exists "apt-get"; then
     sudo apt-get install kitty -y
     echo "Please install SchildiChat, nvim/neovim"
 elif command_exists "dnf"; then
-    sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rust cargo clippy p7zip mosh krita podman podman-docker podman-compose gajim schildichat-desktop -y
+    sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup clippy p7zip mosh krita podman podman-docker podman-compose gajim schildichat-desktop progress yt-dlp genisoimage zstd iperf3 -y
 
     # Install Prism Launcher
     sudo dnf copr enable g3tchoo/prismlauncher
     sudo dnf install prismlauncher-qt5
 elif command_exists "yay"; then
-    yay -S kitty schildichat-desktop-bin digikam eog man-db neovim prismlauncher-qt5-bin --noconfirm --needed
+    yay -S kitty schildichat-desktop-bin digikam man-db neovim prismlauncher-qt5-bin progress --noconfirm --needed
 elif command_exists "zypp"; then
     # Untested
     sudo zypper install kitty -y
@@ -28,6 +30,10 @@ elif command_exists "emerge"; then
     exit
 elif command_exists "apk"; then
     echo Not yet supported, exiting...
+elif command_exists "xbps-install";
+    # 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
 else
     echo "Unsupported: unknown package manager and distro"
     exit
diff --git a/install-stuff/install-qemu-libvirt.bash b/install-stuff/install-qemu-libvirt.bash
index f5398f7..15e0ed9 100755
--- a/install-stuff/install-qemu-libvirt.bash
+++ b/install-stuff/install-qemu-libvirt.bash
@@ -26,6 +26,9 @@ elif command_exists "apk"; then
     sudo apk add git
     sudo rc-update add libvirtd
     sudo rc-service libvirtd start
+elif command_exists "xbps-install"; then
+    sudo xbps-install qemu libvirt virt-manager
+    sudo usermod -aG libvirt $(whoami)
 else
     echo "Unsupported: unknown package manager and distro"
 fi
diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash
index a86dcc3..7e4dd79 100755
--- a/install-stuff/install-steam.bash
+++ b/install-stuff/install-steam.bash
@@ -17,7 +17,7 @@ elif command_exists "dnf"; then
     mkdir $HOME/Applications
     cd $HOME/Applications
     curl -LO $(curl -s https://api.github.com/repos/DavidoTek/ProtonUp-Qt/releases/latest | grep "browser_download_url.*ProtonUp-Qt-.*-x86_64.AppImage" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -C -
-    cd -  # throws an error but it works?
+    cd - # throws an error but it works?
     AppImageLauncherSettings &
     sleep 5
     kill $(pidof AppImageLauncherSettings)
@@ -28,6 +28,9 @@ elif command_exists "yay"; then
     #sudo $EDITOR /etc/pacman.conf
     yay -S steam
     yay -S protonup-qt-bin dosbox inotify-tools timidity scummvm xdotool xwinfo yad --noconfirm --needed
+elif command_exists "xbps-install"; then
+    sudo xbps-install steam gperftools gperftools-32bit
+    # missing: protonup-qt
 else
     echo "IDK"
 fi
diff --git a/install-stuff/install-vesktop.bash b/install-stuff/install-vesktop.bash
index bfbfdee..5a0e995 100755
--- a/install-stuff/install-vesktop.bash
+++ b/install-stuff/install-vesktop.bash
@@ -16,6 +16,8 @@ elif command_exists "yum"; then
     rm ./vesktop-*.rpm
 elif command_exists "pacman"; then
     yay -S vesktop-bin --noconfirm --needed
+elif command_exists "xbps-install"; then
+    echo "VESKTOP UNSUPPORTED ON VOID"
 else
     echo "IDK, check the repo: https://github.com/Vencord/Vesktop"
 fi
diff --git a/install-stuff/install-vs-code.bash b/install-stuff/install-vs-code.bash
index 1f01a1b..4e13d50 100755
--- a/install-stuff/install-vs-code.bash
+++ b/install-stuff/install-vs-code.bash
@@ -34,6 +34,8 @@ elif command_exists "emerge"; then
 elif command_exists "apk"; then
     echo Not yet supported, exiting...
     exit
+elif command_exists "xbps-install"; then
+    sudo xbps-install vscode
 else
     echo "Unsupported: unknown package manager and distro"
 fi
diff --git a/install-stuff/install-yt-music.bash b/install-stuff/install-yt-music.bash
index 662c3fd..02cf6ec 100755
--- a/install-stuff/install-yt-music.bash
+++ b/install-stuff/install-yt-music.bash
@@ -16,6 +16,10 @@ elif command_exists "yum"; then
     sudo dnf install youtube-music -y
 elif command_exists "yay"; then
     yay -S youtube-music-bin --noconfirm --needed
+elif command_exists "xbps-install"; then
+    cd ~/Applications
+    curl -LO $(curl -s https://api.github.com/repos/th-ch/youtube-music/releases/latest | grep "browser_download_url.*YouTube-Music-.*.AppImage" | cut -d : -f 2,3 | tr -d \") -C -
+    cd -
 else
     echo "IDK, check the repo: https://github.com/th-ch/youtube-music"
 fi