weechat: rename servers

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index cd62f3fd8aa29ac26ff1f1cdf7a6838f7f971ccd..653f9741d16208ea9faec1b2cc9ee4dc12a2a9fd 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -20,7 +20,7 @@ autoload -U compinit; compinit
 
 # 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,7 +29,9 @@ 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)
 
 # source aliases
@@ -41,6 +43,7 @@ done
 # vim stuff
 export EDITOR=vim
 export VISUAL=vim
+export BROWSER=dwb
 
 # set up a few named directories
 hash -d Skaro=/mnt/Skaro
@@ -49,8 +52,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 UniMaas=~/Dropbox/Documents/UniMaas
+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