Makefile: add target for git

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 5a02eb6a79023756a51eb8f85179b7a30b363771..2fe6f593f4a2110ed402a35c0fca7e411b2af526 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,12 +10,15 @@ set runtimepath& " reset rtp
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle

-call vundle#rc('$XDG_DATA_HOME/vim')
+call vundle#begin('$XDG_DATA_HOME/vim')

 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 

+Plugin 'AndrewRadev/switch.vim'

 Plugin 'airblade/vim-gitgutter'
 Plugin 'airblade/vim-gitgutter'

+Plugin 'alepez/vim-gtest'

 Plugin 'bling/vim-airline'
 Plugin 'bling/vim-airline'

+Plugin 'chrisbra/checkattach'

 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'


@@ -26,18 +29,25 @@ 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 'scrooloose/syntastic'

+Plugin 'sgeb/vim-diff-fold'

 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-endwise'
 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-endwise'

+Plugin 'tpope/vim-eunuch'

 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'

-Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-surround'  "investigate vim-sandwich

 Plugin 'tpope/vim-unimpaired'
 Plugin 'tpope/vim-unimpaired'

+Plugin 'tweekmonster/spellrotate.vim'

 Plugin 'valloric/youcompleteme'
 Plugin 'valloric/youcompleteme'

+Plugin 'vim-scripts/mediawiki.vim'

 Plugin 'vim-scripts/replacewithregister'
 Plugin 'vim-scripts/yankring.vim'
 
 Plugin 'vim-scripts/replacewithregister'
 Plugin 'vim-scripts/yankring.vim'
 


@@ -52,27 +62,19 @@ Plugin 'honza/vim-snippets'
 Plugin 'kana/vim-textobj-user'
 Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'
 Plugin 'kana/vim-textobj-user'
 Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'

-
-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
-
-" seems to have problems right now... may be add later?
-" Plugin 'jalcine/cmake.vim'
-" Plugin 'powerman/vim-plugin-viewdoc'
+Plugin 'kana/vim-operator-user'

 
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)

-Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
-" Plugin 'lokaltog/vim-easymotion'
-Plugin 'chrisbra/checkattach'
-Plugin 'nathanaelkane/vim-indent-guides'
+Plugin 'vim-latex/vim-latex'

 Plugin 'alx741/vinfo'
 Plugin 'alx741/vinfo'

-Plugin 'vim-scripts/mediawiki.vim'

 Plugin 'derekwyatt/vim-protodef'
 Plugin 'derekwyatt/vim-protodef'

-Plugin 'rdnetto/ycm-generator'

 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'

+" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+Plugin 'wincent/loupe'
+
+call vundle#end()

 
 " remove entries first
 set runtimepath -=$HOME/.vim
 
 " remove entries first
 set runtimepath -=$HOME/.vim


@@ -155,10 +157,18 @@ set mouse=rnv                   " list of flags for using the mouse
 set ttymouse=xterm              " type of mouse
 
 " messages and info {{{2
 set ttymouse=xterm              " type of mouse
 
 " messages and info {{{2

-set showcmd                     " Show (partial) command in status line.
-set ruler                       " show the cursor position all the time
-set confirm                     " Ask what to do when closing unsaved documents
-set shortmess=filnxtoOI         " don't show intro message
+set showcmd         " Show (partial) command in status line.
+set ruler           " show the cursor position all the time
+set confirm         " Ask what to do when closing unsaved documents
+set shortmess=      " reset option
+set shortmess+=a    " all abbreviations
+set shortmess+=o    " overwrite file-written message
+set shortmess+=O    " file-read message overrides previous
+set shortmess+=t    " truncate file message at start
+set shortmess+=T    " truncate other messages in the middle
+set shortmess+=W    " don't give 'written' or '[w]' when writing a file
+set shortmess+=A    " ignore swapfile warning
+set shortmess+=I    " no splash screen

 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode
 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode


@@ -205,13 +215,12 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " open folds when jumping to line
 set foldopen+=jump
 
 " open folds when jumping to line
 set foldopen+=jump
 

-" save and restore folds
-set viewoptions=cursor          " only save cursor position
+set viewoptions=cursor          " save cursor position
+set viewoptions+=folds          " save folds

 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split

-set diffopt+=iwhite         " ignore white space

 set diffopt+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2
 set diffopt+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2


@@ -246,6 +255,7 @@ set directory=$XDG_CACHE_HOME/vim/swap//
 set history=5000                " how many command lines are remembered
 set wildmenu                    " command-line completion shows a list of matches
 set wildmode=longest:full,full  " specifies how command line completion works
 set history=5000                " how many command lines are remembered
 set wildmenu                    " command-line completion shows a list of matches
 set wildmode=longest:full,full  " specifies how command line completion works

+set wildignorecase              " ignore case when completing file names

 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files
 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files


@@ -325,7 +335,7 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
 
 " bindings {{{1
 

-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>

 map <space> <leader>
 
 " make
 map <space> <leader>
 
 " make


@@ -348,7 +358,7 @@ nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0

-  let pattern = a:0 ? a:1 : '[\\]\@<!\s\+$'
+  let pattern = a:0 ? a:1 : '\s\+$'

   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()
   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()


@@ -434,8 +444,9 @@ nnoremap zx zMzxzt
 
 map <F1> :ls<CR>:b<space>
 
 
 map <F1> :ls<CR>:b<space>
 

-nnoremap <C-L> <C-W>w
-nnoremap <C-H> <C-W>W
+" move between windows (skip previewwindow)
+nnoremap <silent> <C-L> <C-W>w:if &previewwindow \| wincmd w \| endif<CR>
+nnoremap <silent> <C-H> <C-W>W:if &previewwindow \| wincmd W \| endif<CR>

 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>
 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>


@@ -464,7 +475,7 @@ nnoremap [oe :set expandtab<CR>
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)

-  exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+  exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'

 endfor
 
 " toggle auto format of text
 endfor
 
 " toggle auto format of text


@@ -477,11 +488,8 @@ nnoremap <leader><Space> za
 " create folds around visual selection
 vnoremap <leader><Space> zf
 
 " create folds around visual selection
 vnoremap <leader><Space> zf
 

-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
-

 " save with sudo
 " 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


@@ -489,12 +497,6 @@ inoremap <C-C> <Esc>gUiwgi
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 

-" commands {{{1
-command! Cd cd %:h
-command! Cr execute('cd ' . FindGitDirOrHome())
-command! LCd lcd %:h
-command! LCr execute('lcd ' . FindGitDirOrHome())
-

 " plugins options {{{1
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1
 " plugins options {{{1
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1


@@ -541,12 +543,22 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 

+" close-another-window {{{2
+nnoremap <silent> <C-W>c  <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
+

 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0

+let g:pymode_run = 0

 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"

+let g:pymode_lint_cwindow = 0           " don't open cwindow when linting

 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 " signature {{{2
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 " signature {{{2


@@ -559,6 +571,15 @@ let g:SignatureMap = {
   \ 'GotoPrevSpotAlpha'  :  "",
   \ }
 
   \ 'GotoPrevSpotAlpha'  :  "",
   \ }
 

+" switch
+let g:switch_mapping = "<Leader>s"
+
+" spellrotate
+nmap <silent> z] <Plug>(SpellRotateForward)
+nmap <silent> z[ <Plug>(SpellRotateBackward)
+vmap <silent> z] <Plug>(SpellRotateForwardV)
+vmap <silent> z[ <Plug>(SpellRotateBackwardV)
+

 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'


@@ -580,6 +601,9 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 

+" tcomments {{{2
+let g:tcommentTextObjectInlineComment = 'gic'
+

 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")


@@ -621,6 +645,7 @@ call unite#custom#profile('default', 'context', {
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]

+nnoremap [unite]u :UniteResume<CR>

 
 " unite-grep {{{3
 " seems not respected
 
 " unite-grep {{{3
 " seems not respected


@@ -628,18 +653,20 @@ let g:unite_source_grep_max_candidates = 2000
 if executable('ag')
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'
 if executable('ag')
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'

-    let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''

     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>

-command! -nargs=1 Ag Unite grep -input=<args>
+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
+command! -nargs=1 Ag Unite grep:.::<args>

 
 " unite-file_rec {{{3
 if executable('ag')
     " Use ag in unite rec source
 
 " unite-file_rec {{{3
 if executable('ag')
     " Use ag in unite rec source

-    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
+    let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']

 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>

+call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')

 
 " unite-buffer {{{3
 call unite#custom#default_action('buffer', 'open')
 
 " unite-buffer {{{3
 call unite#custom#default_action('buffer', 'open')


@@ -678,14 +705,18 @@ 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']
-nnoremap gd :YcmCompleter GoTo<CR>

 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)
 nmap ga <Plug>(EasyAlign)
 
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)
 nmap ga <Plug>(EasyAlign)
 

+" vim-gtest {{{2
+let g:gtest#highlight_failing_tests = 0
+
+nnoremap <Leader>tt :GTestRun<CR>
+nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+

 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 


@@ -713,6 +744,15 @@ xmap T <Plug>Sneak_T
 omap t <Plug>Sneak_t
 omap T <Plug>Sneak_T
 
 omap t <Plug>Sneak_t
 omap T <Plug>Sneak_T
 

+" vimviki {{{2
+let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
+let g:vimwiki_auto_chdir = 1
+augroup myvimwiki
+  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git -C "%:p:h" pull -q
+  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull -q
+  au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe '!git add "<afile>";git commit -qm"' . strftime("%FT%R") . '";git push -q'
+augroup END
+

 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the
 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the


@@ -723,6 +763,13 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
                   \ | wincmd p | diffthis
 endif
 

+" sort operator {{{2
+function! SortLinesOpFunc(...)
+  '[,']sort
+endfunction
+nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
+vnoremap <silent> gs :sort<cr>
+

 " edit configs  {{{2
 function! EditConfig(what)
     let l:dir = split(&runtimepath,',')[0]
 " edit configs  {{{2
 function! EditConfig(what)
     let l:dir = split(&runtimepath,',')[0]


@@ -792,5 +839,9 @@ function! FindGitDirOrHome()
     return '~'
   endif
 endfunction
     return '~'
   endif
 endfunction

+command! Cd cd %:h
+command! Cdr execute('cd ' . FindGitDirOrHome())
+command! LCd lcd %:h
+command! LCdr execute('lcd ' . FindGitDirOrHome())

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