X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/3fcb2cdfbd4249bdef950973e6f11c91538e7a21..2512c622d1a79a40a95f4d26dda652fc825930fc:/zshrc?ds=inline

diff --git a/zshrc b/zshrc
index 9031177..2e6048a 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,6 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.zsh
+# Path to config files
+ZSH=$XDG_CONFIG_HOME/zsh
+[[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return
 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
@@ -16,7 +17,9 @@ typeset -U fpath    # make fpath a unique array
 [[ -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 "$XDG_CACHE_HOME/zsh" ]] || mkdir -p "$XDG_CACHE_HOME/zsh"
+autoload -U compinit; compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
 
 # miscelaneous options
 setopt extendedglob
@@ -29,6 +32,7 @@ setopt dvorak       # correct_all uses dvorak
 
 # populate path
 typeset -U path     # make path a unique array
+[[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $path)
 [[ -d /extra ]] && path=($path /extra/bin /extra/usr/bin /extra/sbin /extra/usr/sbin)
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
@@ -40,9 +44,14 @@ for alias_file ($ZSH/aliases/*.zsh); do
 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
 hash -d Skaro=/mnt/Skaro
 hash -d ccr=~/ccr
@@ -50,7 +59,7 @@ hash -d src=~/src
 hash -d chroot_testing=/buildsystem/testing/buildroot
 hash -d chroot_master=/buildsystem/master/buildroot
 hash -d chroot_lib32=/buildsystem/lib32/buildroot
-hash -d wineprefixes=/mnt/sdd5/wineprefixes
+hash -d wineprefixes=/mnt/data/wineprefixes
 hash -d UniMaas=~/dropbox/Documents/UniMaas
 
 # set some env variables
@@ -58,7 +67,6 @@ export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle
 
 # ros
 if [[ -f "/opt/ros/groovy/setup.zsh" ]]; then
-    source /opt/ros/groovy/setup.zsh
     export ROS_WORKSPACE=~/src/ros
     export ROS_OS_OVERRIDE=arch
 fi