[+] Fish (#7)

scripts/includes/archlinux.sh

@@ -1,25 +1,11 @@
 if command -v pacman &> /dev/null; then
-    alias upgrade='sudo pacman -Syu'
+    alias upgrade="${ZSHRC_SUDO}pacman -Syu"
     alias install='pacman -Sy'
     alias uninstall='pacman -Rsn'
     alias list-unused='pacman -Qdtq'
 fi
 
 if [ -f "/etc/arch-release" ]; then
-    # Java paths
-    export JDK8="/usr/lib/jvm/java-8-openjdk/"
-    export JDK11="/usr/lib/jvm/java-11-openjdk/"
-    export JDK17="/usr/lib/jvm/java-17-openjdk/"
-    export JDK18="/usr/lib/jvm/java-18-j9/"
-    export JDK19="/usr/lib/jvm/java-19-openjdk/"
-    alias java8="${JDK8}/bin/java"
-    alias java11="${JDK11}/bin/java"
-    alias java17="${JDK17}/bin/java"
-    alias java18="${JDK18}/bin/java"
-    alias java19="${JDK19}/bin/java"
-    export JAVA_HOME=${JDK17}
-    export PATH="${JDK17}/bin:$PATH"
-
     export PATH="$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
 
     # GPG Init
@@ -32,8 +18,8 @@ if [ -f "/etc/arch-release" ]; then
     # Free up cache
     clean-cache() {
         has yay && yay -Sc --noconfirm
-        has pacman && sudo pacman -Sc --noconfirm
-        has pacman && rm -rf /var/cache/pacman
+        has pacman && _zshrc_as_root pacman -Sc --noconfirm
+        has pacman && _zshrc_as_root rm -rf /var/cache/pacman
         has paru && rm -rf "$HOME/.cache/paru"
         has yarn && yarn cache clean
         has conda && conda clean -a