vim/cpp: force some indent options

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 964199dd548b3ebbbc8dcbb17326483ec6449234..2cbf3b6d53ee1c46bcd7f58631f7fd55e5a6ee78 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -461,6 +461,11 @@ for idt in range(1,8)
   exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
 endfor
 
   exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
 endfor
 

+" toggle auto format of text
+nnoremap coa :set <C-R>=&formatoptions =~ "a" ? 'formatoptions-=a' : 'formatoptions+=a'<CR><CR>
+nnoremap [oa :set formatoptions+=a<CR>
+nnoremap ]oa :set formatoptions-=a<CR>
+

 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection
 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
 " create folds around visual selection


@@ -652,9 +657,11 @@ let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 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_extra_conf_vim_data = ['%:p']
 let g:ycm_autoclose_preview_window_after_insertion = 0
 "let g:ycm_extra_conf_vim_data = ['%:p']

-nnoremap <leader>jd :YcmCompleter GoTo<CR>
+nnoremap gd :YcmCompleter GoTo<CR>

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