Commits

Paul McLanahan committed a80ea89

Various zsh improvements and aliases. Add ack options. Fix vim for git editor on OSX.

Comments (0)

Files changed (4)

dotfiles/.bash_aliases

 #alias djsetuptest='django-test-setup.py -cm && testsyncdb && testmigrate'
 alias djtest='python manage.py test --settings=settings_local_test'
 alias djrunserver='python manage.py runserver 0.0.0.0:8000'
-alias pysearch='find . -name "*.py" -o -name "*.html" -o -name "*.js" -o -name "*.css" | xargs grep -in'
-alias svnupup='pushd .. && rmpyc && svn up && popd'
+alias djcoverage='python manage.py test --with-coverage && coverage html'
+alias startredis='redis-server /usr/local/etc/redis.conf'
 
 cl(){
     cd $1 && ll
 }
+
+alias gsu='git su'
+alias gci='git ci'
 [extensions]
 #inotify =
+bookmarks =
 fetch =
 color =
 purge =
 set visualbell t_vb=    " turn off error beep/flash
 set novisualbell    " turn off visual bell
 set nobackup        " do not keep a backup file
+set nowritebackup
 set number          " show line numbers
 set numberwidth=4   " line numbering takes up 5 spaces
 set ignorecase      " ignore case when searching
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git osx brew django pip vagrabt)
+plugins=(git osx brew django vagrant npm node)
 
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
 export PATH=~/.local/bin:/usr/local/share/python:/usr/local/bin:/Users/pmclanahan/.virtualenvs/betafarm/bin:/usr/local/share/python:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin
+export NODE_PATH="/usr/local/lib/node_modules:${NODE_PATH}"
 
 # virtualenvwrapper and pip
 export PIP_USE_MIRRORS=true
 export VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python
 export VIRTUAL_ENV_DISABLE_PROMPT=true
 
+export LESS="-FSRXi"
+export GRIN_ARGS="-C 2"
+export ACK_OPTIONS="--pager=less -C 2 --smart-case --ignore-dir=vendor --ignore-dir=vendor-local --type-set rst=.rst"
+
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
     source /usr/local/bin/virtualenvwrapper.sh
 elif [ -f /usr/local/share/python/virtualenvwrapper.sh ]; then
 fi
 
 #alias git=hub
-export EDITOR=/usr/bin/vim
+alias pastebin=lodgeit.py
+export EDITOR=vim
+
+source ~/.bash_aliases
+if [ -f ~/.zsh_local ]; then
+    source ~/.zsh_local
+fi
+
+# pip completion
+eval $(pip completion --zsh)
+eval $(hub alias -s zsh)