X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=019c81e94a4b022f75589c320a4d7110d8dbb25a;hp=21e8f9a4704df75770bec602831f8ff214f883d8;hb=c7d02493ef0793e24f6c394952b87ef24dad6015;hpb=a50d445c0e555e50f7250a96ed5a027617b93335

diff --git a/init.vim b/init.vim
index 21e8f9a..019c81e 100644
--- a/init.vim
+++ b/init.vim
@@ -31,6 +31,7 @@ set smartindent
 set incsearch
 set hlsearch
 
+set foldcolumn=4
 set colorcolumn=+1
 set mouse=a
 set wildmenu
@@ -38,13 +39,6 @@ set wildmode=longest,list:full
 
 set tabpagemax=100
 
-" Some terminals cause weired symbols due to broken cursor-shape termcodes.
-if has('nvim')
-    "set guicursor=
-    " Workaround some broken plugins which set guicursor indiscriminately.
-    "au OptionSet guicursor noautocmd set guicursor=
-end
-
 syntax on
 
 " Load some macros
@@ -143,12 +137,15 @@ let g:vim_markdown_math=1
 " Some filetype-specific settings
 
 au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
-au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal fo+=n
+au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal formatoptions+=n
+au Filetype mail setlocal formatoptions+=o
+" Add | for block quotation, such that gq respects it
+au Filetype mail setlocal comments+=n:\|
 
 au Filetype go setlocal shiftwidth=8 tabstop=8 noexpandtab
 au Filetype tex setlocal shiftwidth=2 tabstop=2
 
-au FileType mediawiki setlocal wrap linebreak tw=0
+au FileType mediawiki setlocal wrap linebreak textwidth=0
 
 "git scissor line
 au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
@@ -167,6 +164,12 @@ au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
 
 au BufEnter *.cpp,*.cc,*.cxx let b:fswitchdst='h,hxx,hpp,hh'
 au BufEnter *.h,*.hh,*.hxx let b:fswitchdst='cc,c,cxx,cpp'
+au BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
+
+augroup autofoldcolumn
+  au!
+  au CursorHold,BufWinEnter * AutoOrigamiFoldColumn
+augroup END
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
@@ -177,6 +180,7 @@ au FileType markdown call RagtagInit()
 
 let g:detectspelllang_langs = {}
 let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
+au FileType mail let g:VimMailSpellLangs=['de', 'en']
 
 :let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'],
       \ ['|', 'OBSOLETE(o)', 'WONT(n)'],
@@ -186,6 +190,7 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
       \ 'template_path': '~/.vim/vimwiki/templates',
       \ 'template_default': 'default',
       \ 'template_ext': '.html'}]
+let g:vimwiki_global_ext = 0
 
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete
@@ -204,6 +209,12 @@ au FileType java imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
 au FileType java nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 
+let g:VimMailContactsProvider=['khard']
+let g:VimMailContactsCommands={
+    \'khard':
+    \{ 'query' : "khard email --parsable --search-in-source-files",
+        \'sync': "/bin/true"}
+  \}
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""