X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/d32d580519e7630640f5337409f2b0d87962f7af..dbb5ec76ee755f6281551355fa8d4360147eebee:/zshrc?ds=sidebyside

diff --git a/zshrc b/zshrc
index 653f974..2d8463f 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,8 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.zsh
+# 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
@@ -13,10 +16,12 @@ ZSH_THEME="ramsi"
 
 # load my functions
 typeset -U fpath    # make fpath a unique array
-[[ -d ~/.zsh/functions ]] && fpath=(~/.zsh/functions $fpath)
+[[ -d $ZSH/functions ]] && fpath=($ZSH/functions $fpath)
 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 
-autoload -U compinit; compinit
+# initialise completion
+[[ -d "$ZSH_CACHE" ]] || mkdir -p "$ZSH_CACHE"
+autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
 # miscelaneous options
 setopt extendedglob
@@ -35,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
@@ -58,8 +67,3 @@ hash -d UniMaas=~/dropbox/Documents/UniMaas
 # set some env variables
 export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle
 
-# ros
-if [[ -f "/opt/ros/groovy/setup.zsh" ]]; then
-    export ROS_WORKSPACE=~/src/ros
-    export ROS_OS_OVERRIDE=arch
-fi