updates default programs and xdg environs. use xdg dirs for completion files

2 files changed, 13 insertions, 12 deletions

diff --git a/zprofile b/zprofile
index f4c2e87..10e46ce 100755
--- a/zprofile
+++ b/zprofile
@@ -1,11 +1,13 @@
 #!/usr/bin/env zsh
 
 # Default programs
-export WM='awesome'
-export EDITOR='nvim'
+export VISUAL='nvim'
+export EDITOR="$VISUAL"
 export TERMINAL='st'
-export BROWSER='launch firefox'
+export BROWSER='firefox'
 export SUDO='doas'
+export MANPAGER='nvim +Man!'
+export WM='awesome'
 
 # Use sudo=${SUDO-sudo}
 [ $EUID = 0 ] && export SUDO=''  # When running as root, don't use sudo
@@ -27,11 +29,11 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 
 export XDG_DATA_HOME="$HOME/.local/share"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export ELECTRUMDIR="$XDG_DATA_HOME/electrum"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
 export PYTHONUSERBASE="$XDG_DATA_HOME/python"
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_DATA_HOME/java"
 
 export XDG_STATE_HOME="$HOME/.local/state"
@@ -43,17 +45,11 @@ export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
 # Path
 setopt nullglob  # Set in case .local/bin doesn't exist
 for lbin in "$HOME/.local/bin"{/,/*/}; do export PATH="${lbin%/}:$PATH"; done 2>/dev/null  # Add ~/.local/bin and all sub dirs
-export PATH="$HOME/.local/opt:$PATH"
-export PATH="$CARGO_HOME/bin:$PATH"
-export PATH="$PYTHONUSERBASE/bin:$PATH"
-
-# Theming
-export QT_QPA_PLATFORMTHEME='gtk2'
 
 # Misc Zsh setup
 mkdir -p "$(dirname "$ZHISTFILE")"
 source "$ZDOTDIR/profiles/zprofile.$HOST" 2>/dev/null  # Source additional host-specific profiles
-source /etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh 2>/dev/null  # Source home-manager session environment vars
+source "/etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh" 2>/dev/null  # Source home-manager session environment vars
 
 # Autostart X after login
 [ -z $DISPLAY ] && [[ $UID != 0 ]] && [[ $TTY =~ /dev/tty(1|C0) ]] && command -v startx &> /dev/null && startx "$X11CONFIG/xinitrc"
diff --git a/zshrc b/zshrc
index 437dd8e..cc0bedf 100755
--- a/zshrc
+++ b/zshrc
@@ -29,4 +29,9 @@ setopt INTERACTIVE_COMMENTS  # Comments won't be interpreted in an interactive s
 # Disable bell
 unsetopt BEEP
 
-zplugInitialize  # Load zsh plugins using zplug; goes last
+# Use XDG dirs for completion files
+zstyle ':completion:*' cache-path "$XDG_CACHE_HOME"/zcompcache
+compinit -d "$XDG_CACHE_HOME"/zcompdump-$ZSH_VERSION
+
+# Load zsh plugins using zplug; goes last
+zplugInitialize