eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move system-specific configuration to .env; remove .env.darwin

Browse source
This commit is contained in:
Eryn Wells 2012-07-20 09:41:48 -07:00
parent e2234bd4a0
commit ec39d11f26
2 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
env
View file

@ -1,20 +1,55 @@
# .env # .env
# vim: ft=zsh # vim: ft=zsh
# #
# Environment settings for bash and derivatives # Environment settings for bash and derivatives. The env scripts are sources by
# Zsh for every shell, even the non-interactive ones, so this needs to be small
# and quick. Any configuration that will only be used for interactive sessions
# should be in the rc scripts.
# #
# Eryn Wells <eryn@erynwells.me> # Eryn Wells <eryn@erynwells.me>
export SYS=`uname -s | tr A-Z a-z` export SYS=`uname -s | tr A-Z a-z`
PAGER="less"
MANPAGER=$PAGER
EDITOR="vim"
VISUAL=$EDITOR
LESSHISTFILE="-"
GREP_OPTIONS="--color=auto"
GREP_COLOR="1;32"
export PAGER MANPAGER \
EDITOR VISUAL \
LESSHISTFILE \
GREP_OPTIONS GREP_COLOR
PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
# NOTE: These prepended to $PATH in reverse order, so $HOME/bin will end up
# being the first path component.
[ -d /usr/X11/bin ] && PATH=$PATH:/usr/X11/bin [ -d /usr/X11/bin ] && PATH=$PATH:/usr/X11/bin
[ -d /opt/local/bin ] && PATH=/opt/local/bin:$PATH [ -d /opt/local/bin ] && PATH=/opt/local/bin:$PATH
[ -d $HOME/.local/bin ] && PATH=$HOME/.local/bin:$PATH [ -d $HOME/.local/bin ] && PATH=$HOME/.local/bin:$PATH
[ -d $HOME/bin ] && PATH=$HOME/bin:$PATH [ -d $HOME/bin ] && PATH=$HOME/bin:$PATH
export PATH export PATH
# System specific environment settings # System specific environment settings
[ -e $HOME/.env.$SYS ] && source $HOME/.env.$SYS case $SYS in
darwin)
export PATH=$HOME/Library/Python/2.7/bin:$PATH
local py27local=$HOME/Library/Python/2.7/lib/python/site-packages
if [[ ! -z $PYTHONPATH ]]; then
[ -d $py27local ] && PYTHONPATH=$py27local:$PYTHONPATH
else
PYTHONPATH=$py27local
fi
export PYTHONPATH
;;
linux)
export MAIL="/var/mail/$USER"
;;
esac
# Local environment settings # Local environment settings
[ -e $HOME/.env.local ] && source $HOME/.env.local [ -e $HOME/.env.local ] && source $HOME/.env.local

16
env.darwin
View file

@ -1,16 +0,0 @@
# .env.darwin
# vim: ft=zsh
#
# Darwin-specific environment settings
#
# Eryn Wells <eryn@erynwells.me>
export PATH=$HOME/Library/Python/2.7/bin:$PATH
local py27local=$HOME/Library/Python/2.7/lib/python/site-packages
if [[ ! -z $PYTHONPATH ]]; then
[ -d $py27local ] && PYTHONPATH=$py27local:$PYTHONPATH
else
PYTHONPATH=$py27local
fi
export PYTHONPATH