Adding XDG settings and moving ZSH

dot_zsh/configs/history.zsh → dot_config/zsh/configs/history.zsh

@@ -11,4 +11,3 @@ setopt hist_verify            # Do not submit history searches before allowing f
 #HISTCONTRO=ignoreboth:erasedups # Ignore duplicates in the history and commands starting with space
 HISTSIZE=10000
 SAVEHIST=10000
-HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history

dot_zshrc.tmpl → dot_config/zsh/dot_zshrc.tmpl

@@ -1,9 +1,9 @@
 # load custom executable functions
-for function in ~/.zsh/functions/*; do
+for function in "$ZDOTDIR"/functions/*; do
   source $function
 done
 
-# extra files in ~/.zsh/configs/pre , ~/.zsh/configs , and ~/.zsh/configs/post
+# extra files in $ZDOTDIR/configs/pre , $ZDOTDIR/configs , and $ZDOTDIR/configs/post
 # these are loaded first, second, and third, respectively.
 _load_settings() {
   _dir="$1"
@@ -32,7 +32,7 @@ _load_settings() {
     fi
   fi
 }
-_load_settings "$HOME/.zsh/configs"
+_load_settings "$ZDOTDIR/configs"
 
 declare -A hostname_colors
 

dot_zshenv

@@ -1,3 +1,14 @@
+# Ensure XDG locations are defined
+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
+
+# Move most of ZSH into XDG locations
+export ZDOTDIR="$XDG_CONFIG_HOME"/zsh
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+
+
 # Taken from https://github.com/thoughtbot/dotfiles/blob/master/zshenv
 
 local _old_path="$PATH"