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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index c76bfad4d9d1596e27f7ada21e22dbfa063e459d..45b29fde046582f4c19807afb4a749811f69063e 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
 


@@ -34,8 +34,14 @@ source $ZSH/oh-my-zsh.sh
 
 export TERM=screen-256color
 export JAVA_HOME=$(/usr/libexec/java_home)
 
 export TERM=screen-256color
 export JAVA_HOME=$(/usr/libexec/java_home)

-export PATH=/usr/local/bin:/usr/local/sbin:$PATH
+export PATH=/usr/local/share/npm/bin:/Users/benbeltran/Projects/nitrogen/bin:/usr/local/bin:/usr/local/sbin:$PATH

 export NODE_PATH=/usr/local/lib/node_modules:$NODE_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"


@@ -46,18 +52,33 @@ echo -e "\033[m"
 alias dwarffortress="/Applications/Dwarf\ Fortress/df"
 alias ls="ls -FG"
 alias rspec="rspec --color"
 alias dwarffortress="/Applications/Dwarf\ Fortress/df"
 alias ls="ls -FG"
 alias rspec="rspec --color"

+alias nitro="nitrogen.js"
+alias agjs="ag -G \".*\\.js\""
+alias agrb="ag -G \".*\\.js\""
+alias agcss="ag -G \".*\\.css\""
+alias start-occipital="node occipital_server -c /etc/occipital/configuration.json -r  -r /Users/benbeltran/Projects/nitrogen/repository_server"
+alias spawn-server="python -m SimpleHTTPServer"
+alias ta="tmux attach -t "
+
+#Tmuxinator and RVM scripts
+[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator

 
 

-#Git utility aliases
-alias gpsc="git push origin $GIT_BRANCH"
-alias gplc="git pull origin $GIT_BRANCH"
+bindkey -v
+bindkey '^R' history-incremental-pattern-search-backward

 
 

-#Screeninator and RVM scripts
-[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
+ggb() {
+    git grep -n $1 | while IFS=: read i j k; do git blame -L $j,$j $i | cat; done
+}

 
 #
 # End of the custom things from my bash profile.
 # There's probably a more "zsh-ish" way of doing these, but I have no time.
 #
 
 
 #
 # End of the custom things from my bash profile.
 # There's probably a more "zsh-ish" way of doing these, but I have no time.
 #
 

+# The python stuff.
+export WORKON_HOME=$HOME/.virtualenvs
+export PROJECT_HOME=$HOME/Projects
+source /usr/local/bin/virtualenvwrapper.sh
+

 # 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