Backup UH

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index aad02d395f618d849012cdb1b48017377b83903d..ceabb0ccccc7cbc99a7e19a5aed2c6eefa7d57be 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,8 +1,10 @@
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh
+ZSH_DATA=$XDG_DATA_HOME/zsh
 ZSH_CACHE=$XDG_CACHE_HOME/zsh
-[[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return
+[[ ! -d "$ZSH" ]]       && echo "Missing config dir: '$ZSH'"      && return
 [[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return
+[[ ! -d "$ZSH_DATA" ]]  && echo "Missing data dir: '$ZSH_DATA'"   && return
 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
@@ -24,7 +26,7 @@ autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
 # miscelaneous options
 setopt extendedglob
-setopt cshnullglob  # if glob does not match, remove pattern, if no glob matches print error
+setopt nonomatch    # if glob does not match, pass it to the command
 setopt numeric_glob_sort # sort numerically not lexically
 setopt noclobber    # don't allow overwriting files with '>', use '>!' instead
 setopt notify
@@ -41,6 +43,9 @@ typeset -U path     # make path a unique array
 [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $path)
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
+# osx gnu utils (installed via brew)
+[[ -d /usr/local/opt/coreutils/libexec/gnubin ]] && path=(/usr/local/opt/coreutils/libexec/gnubin $path)
+[[ -d /usr/local/opt/findutils/libexec/gnubin ]] && path=(/usr/local/opt/findutils/libexec/gnubin $path)
 
 # source aliases
 [[ -f $XDG_CONFIG_HOME/aliases ]] && source $XDG_CONFIG_HOME/aliases
@@ -49,14 +54,10 @@ for alias_file ($ZSH/aliases/*.zsh); do
 done
 
 # set up a few named directories
-hash -d Skaro=/mnt/Skaro
+hash -d fook=/mnt/fook
 hash -d ccr=~/ccr
 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/data/wineprefixes
-hash -d UniMaas=~/dropbox/Documents/UniMaas
-
-# set some env variables
-export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle