Merge branch 'master' of github.com:atomaka/dotfiles

This commit is contained in:
Andrew Tomaka 2013-08-25 22:24:56 -04:00
commit 1c5815b178

9
.zshrc
View file

@ -8,8 +8,8 @@ ZSH=$HOME/.oh-my-zsh
ZSH_THEME="gnzh" ZSH_THEME="gnzh"
if [[ "$OSTYPE" == darwin* ]]; then if [[ "$OSTYPE" == darwin* ]]; then
PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" PATH="/opt/boxen/homebrew/opt/coreutils/libexec/gnubin:$PATH"
MANPATH="/usr/local/opt/coreutils/libexec/gnubin:$MANPATH" MANPATH="/opt/boxen/homebrew/apt/coreutils/libexec/gnubin:$MANPATH"
fi fi
# List directory when changing (github/r00k) # List directory when changing (github/r00k)
@ -81,7 +81,8 @@ if [ $TERM="xterm" ]; then
export TERM=xterm-256color export TERM=xterm-256color
fi fi
# tmuxinator
export EDITOR='vim' export EDITOR='vim'
[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
if [[ "$OSTYPE" == darwin* ]]; then
source /opt/boxen/env.sh
fi