From b98ce61042ee1a411dda4ebe78f42366a63b9595 Mon Sep 17 00:00:00 2001
From: agryphus <agryphus@gmail.com>
Date: Fri, 29 Sep 2023 13:40:49 -0400
Subject: [PATCH] Zsh stuff

---
 .config/zsh/.zprofile | 2 ++
 .config/zsh/.zshenv   | 8 +++++---
 .config/zsh/.zshrc    | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index 00f1ddc..695c91d 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -22,4 +22,6 @@ eval $(gpg-agent --daemon)
 export PATH="$PATH:~/.local/share/cargo/bin/"
 export PATH="$PATH:$JAVA_HOME/bin/"
 
+export PATH=~/.local/bin/overrides:$PATH # Overriding /usr/bin/*
 export PATH=~/.local/bin:$PATH # Highest precedence to local bin
+
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index f950864..f030057 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -17,7 +17,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_STATE_HOME="$HOME/.local/state"
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/config"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
 export EMACS_INIT_FILE="$XDG_CONFIG_HOME/emacs"
 export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
 export GIT_CONFIG="$XDG_CONFIG_HOME/git/config"
@@ -27,8 +27,8 @@ export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export NPM_CONFIG_PREFIX="$XDG_CACHE_HOME/npm"
-export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var
+export SSB_HOME="$XDG_DATA_HOME/zoom"
+export TEXMFVAR="$XDG_CACHE_HOME/texlive/texmf-var"
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
 
@@ -36,6 +36,8 @@ export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$X
 export JAVA_HOME="/usr/lib/jvm/default/"
 export XSECURELOCK_PASSWORD_PROMPT='kaomoji'
 
+export WALLPAPER=~/.config/wallpaper
+
 export SUDO_PROMPT="
                   ⢀⡔⣻⠁ ⢀⣀⣀⡀        
     ⢀⣾⠳⢶⣦⠤⣀       ⣾⢀⡇⡴⠋⣀⠴⣊⣩⣤⠶⠞⢹⣄   
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index c6b5272..6c470cb 100755
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -17,6 +17,7 @@ alias blueman='blueman-manager'
 alias spotify='spotify-launcher'
 alias spotify-launcher='dlkiller spotify-launcher'
 alias zoom='dlkiller zoom'
+alias tor='torbrowser-launcher'
 
 # Some wsl stuff
 alias clip=/mnt/c/Windows/System32/clip.exe
@@ -166,7 +167,7 @@ function parse_git() {
 
 function parse_conda() {
     env=$CONDA_DEFAULT_ENV
-    if [ -z "$env" ] || [ "$env" = "base" ]; then
+    if [ -z "$env" ]; then
         echo ""
         return
     fi