diff --git a/zshenv b/zshenv index 9d3363c..79d6d9a 100644 --- a/zshenv +++ b/zshenv @@ -3,11 +3,19 @@ # Eryn Wells +local sys=`uname -s | tr A-Z a-z` + + +# Global settings for sh, bash, ksh, zsh derivative shells +[ -e $HOME/.env ] && source $HOME/.env + + PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/X11/bin [ -d /opt/local/bin ] && PATH=/opt/local/bin:$PATH [ -d $HOME/.local/bin ] && PATH=$HOME/.local/bin:$PATH [ -d $HOME/bin ] && PATH=$HOME/bin:$PATH + PAGER="less" MANPAGER=$PAGER EDITOR="vim" @@ -22,12 +30,19 @@ export PATH \ LESSHISTFILE \ GREP_OPTIONS GREP_COLOR -[ `uname -s` = "Linux" ] && export MAIL="/var/mail/$USER" +[ $sys = 'linux' ] && export MAIL="/var/mail/$USER" + local py27local=$HOME/.local/lib/python2.7/site-packages if [[ ! -z $PYTHONPATH ]]; then - [ -d $py27local ] && PYTHONPATH=$PYTHONPATH:$py27local + [ -d $py27local ] && PYTHONPATH=$py27local:$PYTHONPATH else PYTHONPATH=$py27local fi export PYTHONPATH + + +# System specific environment settings +[ -e $HOME/.zshenv.$sys ] && source $HOME/.zshenv.$sys +# Local environment settings +[ -e $HOME/.zshenv.local ] && source $HOME/.zshenv.local