chore(zsh): update plugins and change some other stuff

.config/zsh/.zshenv

@@ -4,15 +4,20 @@ if [[ ! $(tty) =~ ^/dev/tty[0-9]*$ ]]; then
         if [[ -o INTERACTIVE ]]; then
             exec "${SHELL}"
         fi
-}
+    }
 fi
 
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_STATE_HOME="${HOME}/.local/state"
+export XDG_RUNTIME_DIR=/tmp
+
 # Add exports
 if [[ $(uname) == "Darwin" ]]; then
     #ONLY MACOS
-    export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
+    export JAVA_HOME=$(/usr/libexec/java_home)
     export PATH="/opt/homebrew/bin:$PATH"
-    export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
     export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
     export GEM_HOME=$HOME/.gem
     export PATH=$PATH:$GEM_HOME/bin
@@ -31,19 +36,10 @@ export PATH="$HOME/.cargo/bin:$PATH"
 export PATH="$HOME/.ghcup/bin:$PATH"
 export PATH="$HOME/.miniforge3/bin:$PATH"
 export PATH="$HOME/.cabal/bin:$PATH"
+export PATH="$XDG_CONFIG_HOME/emacs/bin:$PATH"
 
 export GOPATH="$HOME/go"
 export GOBIN="$GOPATH/bin"
 
-#Android stuff
-export ANDROID_HOME=~/android/sdk
-export ANDROID_TOOLS_PATHS=$ANDROID_HOME/cmdline-tools/latest/bin:
-export PATH=$ANDROID_TOOLS_PATHS:$PATH:
-
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_CACHE_HOME="${HOME}/.cache"
-export XDG_DATA_HOME="${HOME}/.local/share"
-export XDG_STATE_HOME="${HOME}/.local/state"
-export XDG_RUNTIME_DIR=/tmp
 
 . "$HOME/.cargo/env"

.config/zsh/.zshrc

@@ -27,4 +27,3 @@ source $ZDOTDIR/plugins.zsh
 if [[ $(uname) == "Darwin" ]]; then
     eval "$(/opt/homebrew/bin/brew shellenv)"
 fi
-

.config/zsh/functions.zsh

@@ -10,16 +10,6 @@ function vim {
     fi
 }
 
-function sourceall(){
-    set -e
-    pids=$(pgrep zsh)
-    while IFS= read -r pid; do
-        kill -USR1 "$pid"
-    done <<< "$pids"
-    set +e
-}
-
-
 function routevpn {
         sudo route -n add $@ 10.8.0.1
 }

.config/zsh/plugins.zsh

@@ -5,10 +5,10 @@ fpath+=$ZDOTDIR/plugins/zsh-completions/src
 autoload -U compinit && compinit
 source $ZDOTDIR/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
 
-source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
-
 source $ZDOTDIR/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
 
+source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
+
 zvm_after_init_commands+=('source <(fzf --zsh) && enable-fzf-tab')
 source $ZDOTDIR/plugins/fzf-tab/fzf-tab.plugin.zsh