Commits

Ryan Wilcox committed 9df610d Merge

merge

Comments (0)

Files changed (5)

 	git clone git://github.com/tpope/vim-rails.git vim/bundles/vim-rails
 	git clone git://github.com/tpope/vim-fugitive.git vim/bundles/vim-fugitive
 	git clone git://github.com/tpope/vim-cucumber.git vim/bundles/vim-cucumber
+	git clone https://github.com/scrooloose/nerdtree.git vim/bundles/nerdtree
 	
 	/bin/sh install.sh	
 
 alias p='pwd'
 alias rbi="CDPATH='' bundle install"
+alias w404="watch --beep 'tail -n 500 log/development.log | grep 404'"
-#!/bin/sh
+#!/usr/bin/env zsh
 
 # Information for this script comes from:
 # <http://superuser.com/questions/383124/knowing-user-is-sshing-in-from-a-shell-script>
 
-if [[ $SSH_CONNECTION ]]
+if [[ -n $SSH_CONNECTION ]]
 then
   vim "$@"
 else
+[ui]
+username=Ryan Wilcox <rwilcox@wilcoxd.com>
+ssh = ssh -C
+
+[defaults]
+email = --diffstat --git
+
+[diff]
+git = True
+
+[extensions]
+color=
+convert=
+extdiff=
+graphlog=
+patchbomb=
+record=
+transplant=
+progress =
+
+[bb]
+username = rwilcox
+default_method = ssh
+
+
+[alias]
+blame=annotate -u -n
+rec=record
+shelve_all = shelve --all
+
+[diff]
+git=True
+
+
 noremap <silent><Leader>p :vsplit<CR>
 
 let twitvim_count = 50
+
+" Turns off fancy arrows to avoid potential UTF-8 BS
+" See <http://stackoverflow.com/questions/9927217/vim-nerdtree-suddenly-broke>
+let g:NERDTreeDirArrows=0