Merge branch 'master' of tardis:/dotfiles

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index caa3348aebd7bfa82de166a35bdcea80c4d81e8b..9de1144091f5e3f033a5f2873f979c802a2c57dc 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -42,9 +42,9 @@ Plugin 'derekwyatt/vim-fswitch'
 " Plugin 'powerman/vim-plugin-viewdoc'
 
 Plugin 'airblade/vim-gitgutter'
-Plugin 'Raimondi/delimitMate'
-Plugin 'SirVer/ultisnips'
-Plugin 'Lokaltog/vim-easymotion'
+Plugin 'raimondi/delimitmate'
+Plugin 'sirver/ultisnips'
+Plugin 'lokaltog/vim-easymotion'
 Plugin 'junegunn/vim-easy-align'
 Plugin 'chrisbra/checkattach'
 
@@ -232,12 +232,6 @@ augroup cursor_pos
                 \ endif
 augroup END
 
-" auto source vimrc when saved {{{2
-augroup source_vimrc
-    au!
-    autocmd bufwritepost vimrc source $MYVIMRC
-augroup END
-
 " bindings {{{1
 
 " allow both <space> and / to be <leader>
@@ -416,6 +410,7 @@ nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
+nnoremap <silent> <leader>gb :Gblame<cr>
 
 " NERDTree {{{2
 " open/close NERDTree with \e
@@ -464,9 +459,9 @@ let g:ycm_autoclose_preview_window_after_insertion = 1
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
-" vim-easy-align
+" vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
-vnoremap <Enter> <Plug>(EasyAlign)
+vnoremap <CR> <Plug>(EasyAlign)
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0