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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index d68d3dcc67d4b4a1dbb98bd3f50357b6ae382aa2..45b29fde046582f4c19807afb4a749811f69063e 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -34,7 +34,7 @@ source $ZSH/oh-my-zsh.sh
 
 export TERM=screen-256color
 export JAVA_HOME=$(/usr/libexec/java_home)
-export PATH=/Users/benbeltran/Projects/nitrogen/bin:/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 PYTONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
 export PS1="$PS1"'$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I_#P") "$PWD")'
@@ -52,18 +52,33 @@ echo -e "\033[m"
 alias dwarffortress="/Applications/Dwarf\ Fortress/df"
 alias ls="ls -FG"
 alias rspec="rspec --color"
-alias nitro="server.js"
-
-#Screeninator and RVM scripts
+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
 
 bindkey -v
 bindkey '^R' history-incremental-pattern-search-backward
 
+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.
 #
 
+# The python stuff.
+export WORKON_HOME=$HOME/.virtualenvs
+export PROJECT_HOME=$HOME/Projects
+source /usr/local/bin/virtualenvwrapper.sh
+
 # Customize to your needs...