Other changes at cadscan (with the ones I want to keep stripped)

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 44ddd705b3f6c5436eb93d4db1ed7bf187d6db3f..2fe87804c7101e9a164341c90542b9e0b54df05f 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -69,6 +69,10 @@ Plugin 'ompugao/ctrlp-ros'
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'

+Plugin 'ram-z/vim-clang-format'
+Plugin 'sgeb/vim-diff-fold'
+Plugin 'tpope/vim-vinegar'
+Plugin 'vimwiki/vimwiki'

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


@@ -206,8 +210,8 @@ 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
 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines


@@ -326,7 +330,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


@@ -466,7 +470,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


@@ -552,7 +556,7 @@ 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_run = 0
 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_lint_cwindow = 1           " 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


@@ -639,6 +643,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


@@ -731,6 +736,11 @@ 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
 

+" vim-wiki {{{2
+let default_wiki = {}
+let default_wiki.path = '~/wiki'
+let g:vimwiki_list = [default_wiki]
+

 " 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