From 97f6fe7123ad3176ff98b1aaa37fd5268bc392ed Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Tue, 16 Jul 2013 19:36:06 -0400
Subject: [PATCH] tweaks! aliases! shiiiiite

---
 vim/.netrwhist |  4 +++-
 vimrc          | 22 +---------------------
 zlogin         |  3 +++
 zsh/aliases    |  7 +++++++
 zsh/functions  |  4 ++++
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/vim/.netrwhist b/vim/.netrwhist
index 122c18d..cb8acc3 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,3 +1,5 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_cnt =3
 let g:netrw_dirhist_1='/Users/sauron/code/projects/dotfiles/zsh/func'
+let g:netrw_dirhist_2='/Users/pulsar/code/work/redwood/campusperks/test'
+let g:netrw_dirhist_3='/Users/pulsar/code/projects/dotfiles/zsh/func'
diff --git a/vimrc b/vimrc
index 4d1792b..f7f9124 100644
--- a/vimrc
+++ b/vimrc
@@ -178,6 +178,7 @@ map <leader>m :vsplit<cr>
 map <leader>mm :split<cr>
 
 map <leader>gg :topleft 100 :split Gemfile<cr>
+map <leader>gr :topleft 100 :split config/routes.rb<cr>
 
 " Clear the search buffer (highlighting) when hitting return
 function! MapCR()
@@ -243,27 +244,6 @@ endfunction
 :command! PromoteToLet :call PromoteToLet()
 :map <leader>pp :PromoteToLet<cr>
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" MAPS TO JUMP TO SPECIFIC COMMAND-T TARGETS AND FILES
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-map <leader>gr :topleft :split config/routes.rb<cr>
-function! ShowRoutes()
-  " Requires 'scratch' plugin
-  :topleft 100 :split __Routes__
-  " Make sure Vim doesn't write __Routes__ as a file
-  :set buftype=nofile
-  " Delete everything
-  :normal 1GdG
-  " Put routes output in buffer
-  :0r! rake -s routes
-  " Size window to number of lines (1 plus rake output length)
-  :exec ":normal " . line("$") . _ "
-  " Move cursor to bottom
-  :normal 1GG
-  " Delete empty trailing line
-  :normal dd
-endfunction
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " SWITCH BETWEEN TEST AND PRODUCTION CODE
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/zlogin b/zlogin
index dee8256..a161a04 100644
--- a/zlogin
+++ b/zlogin
@@ -3,3 +3,6 @@ if [[ -f ~/.current_path~ ]]; then
   cd `cat ~/.current_path~`
   rm ~/.current_path~
 fi
+
+# Display todos
+quirk
diff --git a/zsh/aliases b/zsh/aliases
index a791580..fd45933 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -40,6 +40,7 @@ alias irb='irb --readline -r irb/completion'
 alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
+alias rmr='rm -rf'
 alias rc='rails console'
 alias reload='source ~/.zshrc'
 alias tail-logs='heroku logs -t'
@@ -47,6 +48,10 @@ alias u='cd ..'
 alias v='vim'
 alias vi='vim'
 alias vimrc='vim ~/.vimrc'
+alias q='quirk'
+alias qc='quirk -c'
+alias qm='quirk -m'
+alias qq='quirk -t'
 alias zsh='vim ~/.zshrc'
 
 
@@ -58,11 +63,13 @@ alias ga='git add --all'
 alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed
 alias gau='git add --update'
 alias gb='git branch'
+alias gbd='git branch -D'
 alias gc='git commit'
 alias gci='echo "Use gc!" && git commit' # Remove when no longer needed
 alias gcl='git clone'
 alias gcm="git commit -m"
 alias gco='git checkout'
+alias gcob='git checkout -b'
 alias gcp='git cherry-pick'
 alias gd='git diff'
 alias gdc='git diff --cached'
diff --git a/zsh/functions b/zsh/functions
index 1295433..4842850 100644
--- a/zsh/functions
+++ b/zsh/functions
@@ -69,3 +69,7 @@ function hist() {
    cat ~/.history|cut -d ';' -f 2- 2>/dev/null| awk '{a[$1]++ } END{for(i in a){print a[i] " " i}}'|sort -rn|head
 }
 
+function run_quirk() {
+  quirk
+}
+