Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ PS1=$'%{\e[1;32m%}%B[%b%{\e[0m%}%n@%m%{\e[1;32m%}%B]%b (%{\e[0m%}%~%{\e[1;32m%})
ORIGINAL_PS1=$PS1

# vars
path=(/bin /usr/local/bin /usr/bin /usr/X11R6/bin /opt/bin)
path=(/bin /usr/local/bin /usr/sbin /usr/bin /usr/X11R6/bin /opt/bin)

# new style completion
if [ -d /usr/share/zsh/$ZSH_VERSION/functions/Completion/ ]; then
Expand Down Expand Up @@ -493,9 +493,11 @@ rvm_loaded_flag=0
[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm

# load local configurations
for i in ~/.zsh_extras/*; do
source $i
done
if [ -d ~/.zsh_extras ]; then
for i in ~/.zsh_extras/*; do
source $i
done
fi

typeset -ga chpwd_functions
typeset -ga preexec_functions
Expand All @@ -522,5 +524,10 @@ zsh_git_update_vars() {
}

export PATH=$PATH:~/env/groovy-2.0.0/bin
if [ -e ~/.rvm/scripts/rvm ]; then
source ~/.rvm/scripts/rvm
fi

PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting

source ~/.rvm/scripts/rvm
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home