X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/cd7d4ad6a3e2e483c652c5fbc3308c5d277a4b99..ba37fa63e8cdedbe958ab51a6aaddcfa4ed2f65d:/zshrc

diff --git a/zshrc b/zshrc
index b5c6b18..7ad8443 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,11 +17,13 @@ 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
-setopt csh_nullglob # if glob does not match, remove pattern, if no glob matches print error
+setopt cshnullglob  # if glob does not match, remove pattern, if no glob matches print error
 setopt numeric_glob_sort # sort numerically not lexically
 setopt noclobber    # don't allow overwriting files with '>', use '>!' instead
 setopt notify
@@ -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)
@@ -42,6 +46,7 @@ done
 # vim stuff
 export EDITOR=vim
 export VISUAL=vim
+export BROWSER=dwb
 
 # set up a few named directories
 hash -d Skaro=/mnt/Skaro
@@ -50,7 +55,14 @@ 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
 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