Makefile: add target for git

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 0ba90f42fa3e07564a182f7d126659b6a57066ad..2fe6f593f4a2110ed402a35c0fca7e411b2af526 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,6 +16,7 @@ Plugin 'gmarik/vundle'
 
 Plugin 'AndrewRadev/switch.vim'
 Plugin 'airblade/vim-gitgutter'
 
 Plugin 'AndrewRadev/switch.vim'
 Plugin 'airblade/vim-gitgutter'

+Plugin 'alepez/vim-gtest'

 Plugin 'bling/vim-airline'
 Plugin 'chrisbra/checkattach'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'bling/vim-airline'
 Plugin 'chrisbra/checkattach'
 Plugin 'derekwyatt/vim-fswitch'


@@ -28,8 +29,11 @@ Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'

+Plugin 'ram-z/vim-clang-format'
+Plugin 'ram-z/vimwiki'

 Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'
 Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'

+Plugin 'sgeb/vim-diff-fold'

 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
 Plugin 'sjl/gundo.vim'


@@ -60,23 +64,15 @@ Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'
 Plugin 'kana/vim-operator-user'
 
 Plugin 'sgur/vim-textobj-parameter'
 Plugin 'kana/vim-operator-user'
 

-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
-

 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'

-Plugin 'ram-z/vim-clang-format'
-Plugin 'sgeb/vim-diff-fold'

 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plugin 'wincent/loupe'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plugin 'wincent/loupe'

-Plugin 'ram-z/vimwiki'
-Plugin 'alepez/vim-gtest'

 
 call vundle#end()
 
 
 call vundle#end()
 


@@ -493,7 +489,7 @@ nnoremap <leader><Space> za
 vnoremap <leader><Space> zf
 
 " save with sudo
 vnoremap <leader><Space> zf
 
 " save with sudo

-cabbrev w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite

 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi
 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi


@@ -661,6 +657,7 @@ if executable('ag')
     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>

+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>

 command! -nargs=1 Ag Unite grep:.::<args>
 
 " unite-file_rec {{{3
 command! -nargs=1 Ag Unite grep:.::<args>
 
 " unite-file_rec {{{3


@@ -708,7 +705,6 @@ let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_complete_in_comments = 1
 let g:ycm_complete_in_strings  = 1
 let g:ycm_autoclose_preview_window_after_insertion = 0
 let g:ycm_complete_in_comments = 1
 let g:ycm_complete_in_strings  = 1
 let g:ycm_autoclose_preview_window_after_insertion = 0

-"let g:ycm_extra_conf_vim_data = ['%:p']

 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode


@@ -844,8 +840,8 @@ function! FindGitDirOrHome()
   endif
 endfunction
 command! Cd cd %:h
   endif
 endfunction
 command! Cd cd %:h

-command! Cr execute('cd ' . FindGitDirOrHome())
+command! Cdr execute('cd ' . FindGitDirOrHome())

 command! LCd lcd %:h
 command! LCd lcd %:h

-command! LCr execute('lcd ' . FindGitDirOrHome())
+command! LCdr execute('lcd ' . FindGitDirOrHome())

 
 " vim:set et sw=2 ts=2 tw=78:
 
 " vim:set et sw=2 ts=2 tw=78: