X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=7a3858e8a3a536822cb6dda5112b34dd45b79322;hp=61806e6cd52c48015658fde838301a871b15f2a3;hb=bb415e77a5be19d4f4cc0481151be9338b1edc72;hpb=048e37869fcafbf2ab196ce013a9e158b6a3f988

diff --git a/init.vim b/init.vim
index 61806e6..7a3858e 100644
--- a/init.vim
+++ b/init.vim
@@ -31,6 +31,9 @@ set smartindent
 set incsearch
 set hlsearch
 
+set foldcolumn=4
+set foldlevelstart=20
+
 set colorcolumn=+1
 set mouse=a
 set wildmenu
@@ -127,7 +130,6 @@ au InsertEnter * call deoplete#enable()
   "au FileType tex          call pencil#init()
 "augroup END
 
-let g:vim_markdown_folding_disabled=1
 let g:vim_markdown_frontmatter=1
 let g:vim_markdown_math=1
 
@@ -135,16 +137,16 @@ 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,asciidoc,mail,gitcommit,mediawiki,vimwiki,tex setlocal spell
+au FileType text,markdown,asciidoc,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 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*$/
@@ -165,6 +167,11 @@ 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
 
@@ -174,6 +181,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)'],
@@ -183,6 +191,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
@@ -201,6 +210,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"}
+  \}
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""