X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/fa47cc94bf4dd9e857b3a1aa27ae7917759779d5..bc2d1837a7cce665b59d64fa5e2e218dfaee3e85:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index caa3348..ab8b569 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -14,15 +14,18 @@ call vundle#rc('$XDG_DATA_HOME/vim') Plugin 'gmarik/vundle' +Plugin 'airblade/vim-gitgutter' Plugin 'bling/vim-airline' Plugin 'elzr/vim-json' -Plugin 'rking/ag.vim' Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' +Plugin 'junegunn/vim-easy-align' Plugin 'kien/ctrlp.vim' Plugin 'kshenoy/vim-signature' Plugin 'majutsushi/tagbar' +Plugin 'rking/ag.vim' Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/syntastic' +Plugin 'sirver/ultisnips' Plugin 'sjl/gundo.vim' Plugin 'tomtom/tcomment_vim' Plugin 'tpope/vim-endwise' @@ -41,11 +44,8 @@ Plugin 'derekwyatt/vim-fswitch' " Plugin 'jalcine/cmake.vim' " Plugin 'powerman/vim-plugin-viewdoc' -Plugin 'airblade/vim-gitgutter' -Plugin 'Raimondi/delimitMate' -Plugin 'SirVer/ultisnips' -Plugin 'Lokaltog/vim-easymotion' -Plugin 'junegunn/vim-easy-align' +Plugin 'raimondi/delimitmate' +Plugin 'lokaltog/vim-easymotion' Plugin 'chrisbra/checkattach' " remove entries first @@ -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 and / to be @@ -336,7 +330,7 @@ cnoremap cnoremap " close all folds open fold in cursor -nnoremap zx zMzxzz15 +nnoremap zx zMzxzt " edit vimrc in new tab nmap ev :tabedit $MYVIMRC:lcd %:p:h @@ -416,6 +410,7 @@ nnoremap gs :Gstatus nnoremap gd :Gdiff nnoremap gc :tab Gcommit -v nnoremap ga :Gwrite +nnoremap gb :Gblame " 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 jd :YcmCompleter GoTo -" vim-easy-align +" vim-easy-align {{{2 " start interactive EasyAlign in visual mode -vnoremap (EasyAlign) +vmap (EasyAlign) " vim-json {{{2 let g:vim_json_syntax_conceal = 0