zsh,bash: move aliases to $XDG_CONFIG_HOME

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index 7ad8443cfc8191eb977a4336e035d76e74709e6d..41c274749e86718011998531fa9d024cebe481c8 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,8 @@
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh
+ZSH_CACHE=$XDG_CACHE_HOME/zsh
 [[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return
+[[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return
 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
@@ -18,8 +20,8 @@ typeset -U fpath    # make fpath a unique array
 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 
 # initialise completion
-[[ -d "$XDG_CACHE_HOME/zsh" ]] || mkdir -p "$XDG_CACHE_HOME/zsh"
-autoload -U compinit; compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
+[[ -d "$ZSH_CACHE" ]] || mkdir -p "$ZSH_CACHE"
+autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
 # miscelaneous options
 setopt extendedglob
@@ -38,14 +40,18 @@ typeset -U path     # make path a unique array
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases
-[[ -f ~/.aliases ]] && source ~/.aliases
+[[ -f ~/$XDG_CONFIG_HOME/aliases ]] && source ~/$XDG_CONFIG_HOME/aliases
 for alias_file ($ZSH/aliases/*.zsh); do
   source $alias_file
 done
 
 # vim stuff
+[[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 export EDITOR=vim
 export VISUAL=vim
+
+# default browser
 export BROWSER=dwb
 
 # set up a few named directories