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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index c76bfad4d9d1596e27f7ada21e22dbfa063e459d..59f79a1fed1f31ea1c82429100ff1f3ffcdce893 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -17,14 +17,14 @@ export ZSH_THEME="ben-prose"
 # DISABLE_LS_COLORS="true"
 
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_LS_COLORS="true"
 
 # Uncomment following line if you want to disable autosetting terminal title.

-# DISABLE_AUTO_TITLE="true"
+DISABLE_AUTO_TITLE="true"

 
 # Uncomment following line if you want disable red dots displayed while waiting for completion
 # DISABLE_COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 
 # Uncomment following line if you want disable red dots displayed while waiting for completion
 # DISABLE_COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)

-plugins=(git brew bundler cap gem osx rails3 rvm)
+plugins=(git brew bundler cap gem osx rails3 rvm dircycle command-coloring npm)

 
 source $ZSH/oh-my-zsh.sh
 
 
 source $ZSH/oh-my-zsh.sh
 


@@ -36,6 +36,12 @@ export TERM=screen-256color
 export JAVA_HOME=$(/usr/libexec/java_home)
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
 export JAVA_HOME=$(/usr/libexec/java_home)
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH

+export PYTONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
+export PS1="$PS1"'$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I_#P") "$PWD")'
+
+#Editor.
+export EDITOR="vim"
+export VISUAL="vim"

 
 #display fortune when I start
 echo -e "\033[30m"
 
 #display fortune when I start
 echo -e "\033[30m"


@@ -47,12 +53,12 @@ alias dwarffortress="/Applications/Dwarf\ Fortress/df"
 alias ls="ls -FG"
 alias rspec="rspec --color"
 
 alias ls="ls -FG"
 alias rspec="rspec --color"
 

-#Git utility aliases
-alias gpsc="git push origin $GIT_BRANCH"
-alias gplc="git pull origin $GIT_BRANCH"
-

 #Screeninator and RVM scripts
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 #Screeninator and RVM scripts
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm

+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+
+bindkey -v
+bindkey '^R' history-incremental-pattern-search-backward

 
 #
 # End of the custom things from my bash profile.
 
 #
 # End of the custom things from my bash profile.


@@ -60,4 +66,3 @@ alias gplc="git pull origin $GIT_BRANCH"
 #
 
 # Customize to your needs...
 #
 
 # Customize to your needs...

-export PATH=/Users/benbeltran/.rvm/gems/ruby-1.9.3-p194/bin:/Users/benbeltran/.rvm/gems/ruby-1.9.3-p194@global/bin:/Users/benbeltran/.rvm/rubies/ruby-1.9.3-p194/bin:/Users/benbeltran/.rvm/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin