1 files changed, 15 insertions, 15 deletions
diff --git a/zsh/zprofile b/zsh/zprofile
index ab2d1d9..1576f84 100644
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -1,40 +1,40 @@
 #!/usr/bin/env zsh
 
 # Default programs:
-export EDITOR="nvim"
-export TERMINAL="st"
-export BROWSER="launch brave"
+export EDITOR='nvim'
+export TERMINAL='st'
+export BROWSER='launch brave'
 
 # Clean up home directory
 export XDG_CACHE_HOME="$HOME/.cache"
-export XAUTHORITY="$XDG_CACHE_HOME/x11/Xauthority"
+export XAUTHORITY="$XDG_CACHE_HOME/Xauthority"
 
 export XDG_CONFIG_HOME="$HOME/.config"
-export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc"
 export INPUTRC="$XDG_CONFIG_HOME/zsh/inputrc"
 export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
 export NOTMUCH_COFIG="$XDG_CONFIG_HOME/notmuch/config"
-export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
+export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" # User env
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 
 export XDG_DATA_HOME="$HOME/.local/share"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
-export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_DATA_HOME/java"
+export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_DATA_HOME/java"
+export ZDATADIR="$XDG_DATA_HOME/zsh" # User env
 
-export LESSHISTFILE="-"
+export LESSHISTFILE='-'
 
 # Path
-for dir in keyboard launch misc sync video x11; do
-	export PATH="/home/timmy/.local/bin/$dir:$PATH";
-done
-
+for lbin in "$HOME/.local/bin"{/,/*/}; do export PATH="${lbin%/}:$PATH"; done # Add ~/.local/bin and all sub dirs
 export PATH="$CARGO_HOME/bin:$PATH"
 
 # Theming
-export QT_QPA_PLATFORMTHEME="qt5ct"
+export QT_QPA_PLATFORMTHEME='qt5ct'
+
+# Misc Zsh setup
+mkdir -p "$ZDATADIR"
 
 # Autostart X after login
-if [[ -z $DISPLAY ]] && [[ "$(id -u)" != 0 ]] && ( [[ $(tty) = /dev/tty1 ]] || [[ $(tty) = /dev/ttyC0 ]] ); then startx $XINITRC; fi
+[ -z $DISPLAY ] && [[ "$(id -u)" != 0 ]] && [[ $TTY =~ /dev/tty(1|C0) ]] && startx $XINITRC