From 92bede480fefb9f06ee6e39091e5243ced75c856 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Wed, 10 Jul 2024 14:29:31 -0500
Subject: [PATCH] Various minor fixes

---
 install-stuff/install-fish.bash  | 2 +-
 install-stuff/install-fonts.bash | 8 ++++----
 install-stuff/install-misc.sh    | 6 +++++-
 install-stuff/install-steam.bash | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/install-stuff/install-fish.bash b/install-stuff/install-fish.bash
index 7ada69f..d2768fc 100755
--- a/install-stuff/install-fish.bash
+++ b/install-stuff/install-fish.bash
@@ -17,7 +17,7 @@ elif command_exists "rpm-ostree" && ! command_exists "fish"; then
     read -p "Press enter to reboot, then run do-everything.bash again"
     reboot
 elif command_exists "pacman"; then
-    sudo pacman -S fish
+    sudo pacman -S fish --noconfirm
 elif command_exists "zypp"; then
     # Untested
     sudo zypper install fish -y
diff --git a/install-stuff/install-fonts.bash b/install-stuff/install-fonts.bash
index 9190458..3b5331c 100755
--- a/install-stuff/install-fonts.bash
+++ b/install-stuff/install-fonts.bash
@@ -4,23 +4,23 @@ 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 -p ~/.local/share/fonts/firacode
 mkdir ./tmp-fonts
 cd ./tmp-fonts
 
 curl $(curl -s https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest | grep "browser_download_url.*FiraCode.zip" | cut -d : -f 2,3 | tr -d \") -LO
 unzip FiraCode.zip
-sudo mv FiraCodeNerdFont*.ttf /usr/share/fonts/firacode/
+mv FiraCodeNerdFont*.ttf  ~/.local/share/fonts/firacode/
 
 if command_exists "xbps-install"; then
     sudo xbps-install font-atkinson-hyperlegible-otf
 else
-    sudo mkdir /usr/share/fonts/atkinson-hyperlegible
+    mkdir -p ~/.local/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/
+    mv AtkinsonHyperlegible*.ttf ~/.local/share/fonts/atkinson-hyperlegible/
 fi
 
 cd -
diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh
index 2495d55..599f1af 100755
--- a/install-stuff/install-misc.sh
+++ b/install-stuff/install-misc.sh
@@ -14,7 +14,11 @@ 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 rustup clippy p7zip mosh krita podman podman-docker podman-compose gajim schildichat-desktop progress yt-dlp genisoimage zstd iperf3 -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 progress yt-dlp genisoimage zstd iperf3 keepassxc python3-pip -y
+
+    # Install schildichat-desktop
+    # should be in my repo, but this works as both a fallback, and is faster than downloading from my repo - updates will come from my repo, though
+    sudo dnf install $(curl -s https://api.github.com/repos/SchildiChat/schildichat-desktop/releases/latest | grep "browser_download_url.*schildichat-desktop-.*.x86_64.rpm" | cut -d : -f 2,3 | tr -d \" | tr -d ' ')
 
     # Install Prism Launcher
     sudo dnf copr enable g3tchoo/prismlauncher
diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash
index e1028ed..6ae18b5 100755
--- a/install-stuff/install-steam.bash
+++ b/install-stuff/install-steam.bash
@@ -13,7 +13,7 @@ if command_exists "apt-get"; then
     sudo dpkg -i steam.deb
 elif command_exists "dnf"; then
     sudo dnf install steam -y
-    sudo dnf install appimagelauncher qt5-qtbase-gui -y
+    sudo dnf install appimagelauncher qt5-qtbase-gui lutris protontricks -y
     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 -