Merge branch 'master' of https://github.com/lengarvey/vimrc

Author: cattekin

config/keybinds.vim

@@ -1,11 +1,14 @@
 " CtrlP search
 call unite#filters#matcher_default#use(['matcher_fuzzy'])
-" call unite#filters#sorter_default#use(['sorter_rank'])
+call unite#filters#sorter_default#use(['sorter_rank'])
+
+" call unite#custom#source('file_rec/async','sorters','sorter_rank')
 nnoremap <silent> <C-p> :Unite -start-insert -buffer-name=files -winheight=10 file_rec/async<cr>
+
 nnoremap <silent> <Leader>m :Unite -start-insert -buffer-name=recent -winheight=10 file_mru<cr>
 
 " Buffer nav
-nnoremap <Leader>b :Unite -start-insert -buffer-name=buffers -winheight=10 buffer<cr>
+nnoremap <Leader>b :Unite -buffer-name=buffers -winheight=10 buffer<cr>
 
 " Unite on the bottom
 let g:unite_split_rule = 'botright'

config/neobundle.vim

@@ -22,7 +22,8 @@ NeoBundle 'tpope/vim-fugitive'
 NeoBundle 'Shougo/unite.vim'
 
 " Visual
-NeoBundle 'Lokaltog/vim-powerline'
+" NeoBundle 'Lokaltog/vim-powerline'
+NeoBundle 'bling/vim-airline'
 
 " Editing
 NeoBundle 'tomtom/tcomment_vim'
@@ -50,10 +51,10 @@ NeoBundle 'plasticboy/vim-markdown'
 NeoBundle 'evanmiller/nginx-vim-syntax'
 NeoBundle "pangloss/vim-javascript"
 NeoBundle 'vim-ruby/vim-ruby'
-
-" Colours
-NeoBundle 'twe4ked/vim-colorscheme-switcher'
-NeoBundle 'altercation/vim-colors-solarized'
+" 
+" " Colours
+" NeoBundle 'twe4ked/vim-colorscheme-switcher'
+" NeoBundle 'altercation/vim-colors-solarized'
 NeoBundle 'nanotech/jellybeans.vim'
 NeoBundle 'tomasr/molokai'
 

config/pluginconfig.vim

@@ -11,3 +11,19 @@ let g:NERDTreeDirArrows = 1                 " Enable directory arrows
 
 " use special powerline font
 let g:Powerline_symbols = 'fancy'
+
+" unite searching stuff
+if executable('ag')
+  " Use ag in unite grep source.
+  let g:unite_source_grep_command = 'ag'
+  let g:unite_source_grep_default_opts = '--nocolor --nogroup --hidden'
+  let g:unite_source_grep_recursive_opt = ''
+elseif executable('ack-grep')
+  " Use ack in unite grep source.
+  let g:unite_source_grep_command = 'ack-grep'
+  let g:unite_source_grep_default_opts =
+  \ '--no-heading --no-color -a -H'
+  let g:unite_source_grep_recursive_opt = ''
+endif
+
+runtime macros/matchit.vim