updated

Author: Reed Allman

.vimrc

@@ -19,19 +19,14 @@ syntax on                         "syntax highlighting
 let mapleader=","                 "remap leader to ,
 set pastetoggle=<F2>
 noremap <silent> <leader>l :noh<CR>
-noremap <silent> <leader>o :tab sp<CR>
-noremap <silent> <leader>x :tabc<CR>
-map <leader>= mzgg=G`z<CR>
+noremap <silent> <leader>d :bd<CR>
 
 " splits                          "much more 'vim' like
 nnoremap <C-J> <C-W><C-J>
 nnoremap <C-K> <C-W><C-K>
 nnoremap <C-L> <C-W><C-L>
 nnoremap <C-H> <C-W><C-H>
-nmap <c-w>l :vertical res +20<cr>
-nmap <c-w>h :vertical res -20<cr>
-nmap <c-w>j :res -20<cr>
-nmap <c-w>k :res +20<cr>
+nnoremap <C-=> <C-W>=
 
 set splitbelow                    "naturally go right and down
 set splitright
@@ -73,9 +68,9 @@ augroup vimrcEx
   " Don't do it for commit messages, when the position is invalid, or when
   " inside an event handler (happens when dropping a file on gvim).
   autocmd BufReadPost *
-	\ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") |
-	\   exe "normal g`\"" |
-	\ endif
+        \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") |
+        \   exe "normal g`\"" |
+        \ endif
 
   " Cucumber navigation commands
   autocmd User Rails Rnavcommand step features/step_definitions -glob=**/* -suffix=_steps.rb
@@ -84,6 +79,9 @@ augroup vimrcEx
   " Set syntax highlighting for specific file types
   autocmd BufRead,BufNewFile *.md set filetype=markdown
 
+  " gofmt on save
+  autocmd FileType go autocmd BufWritePre <buffer> Fmt
+
   " Enable spellchecking for Markdown
   autocmd BufRead,BufNewFile *.md setlocal spell
 
@@ -128,7 +126,6 @@ if ! has('gui_running')               "fix the slowness of powerline
   augroup END
 endif
 
-let g:airline_powerline_fonts = 1
 let g:airline_theme = 'tomorrow'
 let g:airline_section_x = ''
 let g:airline_section_y = '%{&filetype}'
@@ -139,9 +136,16 @@ let g:airline#extensions#hunks#enabled = 0
 let g:bufferline_echo = 0
 
 " ====== ctrlp ========
+if executable('ag')
+  " use silver searcher for grep
+  set grepprg=ag\ --nogroup\ --nocolor
+
+  " use ag in CtrlP
+  let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
 
-" ====== NERDTree =====
-map <Leader>m :NERDTreeToggle<CR>
+  "yeah no cache is nice for new files, thanks ag
+  let g:ctrlp_use_caching = 0
+endif
 
 " ====== EasyMotion =====
 let g:EasyMotion_leader_key = '<Leader>'
@@ -172,7 +176,7 @@ vmap <Leader>t: :Tabularize /:<CR>
 "" ======= go ===============
 filetype off
 filetype plugin indent off
-set rtp+=/usr/local/go/misc/vim
+set rtp+=$GOROOT/misc/vim
 filetype plugin indent on
 syntax on
 
@@ -210,13 +214,11 @@ NeoBundle 'airblade/vim-gitgutter'
 NeoBundle 'terryma/vim-multiple-cursors'
 NeoBundle 'w0ng/vim-hybrid'
 NeoBundle 'godlygeek/tabular'
-NeoBundle 'nanotech/jellybeans.vim'
-NeoBundle 'mileszs/ack.vim'
-NeoBundle 'noahfrederick/vim-hemisu'
-NeoBundle 'vim-scripts/ParseJSON'
+NeoBundle 'rking/ag.vim'
+"NeoBundle 'nanotech/jellybeans.vim'
+"NeoBundle 'noahfrederick/vim-hemisu'
 
-set rtp+=~/Dev/openrefactory-vim/
-set rtp+=$GOPATH/src/go-oracle-vim
+set rtp+=~/Dev/OpenRefactory/org.openrefactory.vim.ui/openrefactory-vim
 
 filetype plugin indent on
 NeoBundleCheck

.zshrc

@@ -5,29 +5,7 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-
-ZSH_THEME="kolo"
-
-#rbenv
-if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
-
-#completions
-fpath=(/usr/local/share/zsh-completions $fpath)
-
-# autojump
-autoload -U compinit && compinit
-export AUTOJUMP_IGNORE_CASE=1
-
-
-#suggestions
-autoload -U predict-on
-zle -N predict-on
-zle -N predict-off
-bindkey '^Z' predict-on
-bindkey '^X^Z' predict-off
-zstyle ':predict' verbose 'yes'
-
-bindkey -v
+ZSH_THEME="shrew"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -36,11 +14,11 @@ bindkey -v
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
-# Comment this out to disable bi-weekly auto-update checks
+# Uncomment this to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
 # Uncomment to change how often before auto-updates occur? (in days)
- export UPDATE_ZSH_DAYS=13
+# export UPDATE_ZSH_DAYS=13
 
 # Uncomment following line if you want to disable colors in ls
 # DISABLE_LS_COLORS="true"
@@ -49,7 +27,7 @@ bindkey -v
 # DISABLE_AUTO_TITLE="true"
 
 # Uncomment following line if you want to disable command autocorrection
-# DISABLE_CORRECTION="true"
+DISABLE_CORRECTION="true"
 
 # Uncomment following line if you want red dots to be displayed while waiting for completion
 # COMPLETION_WAITING_DOTS="true"
@@ -62,21 +40,16 @@ bindkey -v
 # 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 autojump brew github zsh-syntax-highlighting sublime rbenv rails4 rake ruby heroku go osx)
+plugins=(osx git github fasd zsh-syntax-highlighting brew rbenv heroku)
 
 source $ZSH/oh-my-zsh.sh
 
-#rbenv
-eval "$(rbenv init -)"
-
 # Customize to your needs...
-export PATH=~/.rbenv/shims:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
-
-### Added by the Heroku Toolbelt
-export PATH="/usr/local/heroku/bin:$PATH"
-#export PATH="/Applications/Postgres.app/Contents/MacOS/bin:$PATH"
+export RBENV_ROOT=/usr/local/var/rbenv
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
 
-### GO
-export GOROOT=/usr/local/go
 export GOPATH=$HOME/Dev/gocode
-export PATH=$GOPATH/bin:$GOROOT/bin:$PATH
+export GOROOT=/usr/local/go
+
+export PATH=$GOPATH/bin:$GOROOT/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh