X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=bd9cfe3f8ff5fe154513dd300dec626bf232a24b;hp=d9e0373503ec054d11b923c7d72c51a3b66f23b0;hb=7db1fbf5bd290509aaec6c8e002d6f0a3617aa04;hpb=5911a72d6701e4fedac1474b5bb878cfa7cab54b diff --git a/init.vim b/init.vim index d9e0373..bd9cfe3 100644 --- a/init.vim +++ b/init.vim @@ -6,6 +6,8 @@ " Some global settings set nocompatible +" Breaks colors for some versions of mosh, but not if tmux is used on top of +" mosh. See https://github.com/mobile-shell/mosh/issues/928 set termguicolors set number set cursorline @@ -29,18 +31,18 @@ set smartindent set incsearch set hlsearch +set foldcolumn=4 set colorcolumn=+1 set mouse=a +set wildmenu set wildmode=longest,list:full set tabpagemax=100 -if has('nvim') - set guicursor= -end - syntax on +" Load some macros +runtime macros.vim """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Some global plugin settings @@ -55,8 +57,11 @@ endif runtime plugsetup.vim +let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] + " Some preferences for indent detection let g:detectindent_min_indent = 2 +let g:detectindent_max_indent = 4 let g:detectindent_preferred_indent = 4 " Attention: Must be run after plugsetup.vim @@ -99,8 +104,12 @@ let NERDTreeQuitOnOpen=1 let g:neomake_c_enabled_makers = ['clangtidy', 'clangcheck'] let g:neomake_cpp_enabled_makers = ['clangtidy', 'clangcheck'] -call neomake#configure#automake('w') -"let g:neomake_logfile = '/tmp/neomake.log' +" Taken from neomake +if OnBattery() + call neomake#configure#automake('w') +else + call neomake#configure#automake('nw', 1000) +endif let g:clang_compilation_database = '.' @@ -109,7 +118,7 @@ let g:python3_host_prog = '/usr/bin/python3' " deoplete requires huge startuptime. Delay loading upon first InsertEnter. let g:deoplete#enable_at_startup = 0 let g:deoplete#enable_smart_case = 1 -autocmd InsertEnter * call deoplete#enable() +au InsertEnter * call deoplete#enable() "augroup pencil "au! @@ -124,26 +133,19 @@ let g:vim_markdown_frontmatter=1 let g:vim_markdown_math=1 -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Some filetype settings - -" mutt and neomutt -au BufRead,BufNewFile ~/.mutt/tmp/*mutt-* setlocal filetype=mail -au BufRead,BufNewFile *.muttrc setlocal filetype=muttrc - -au BufRead,BufNewFile *.cls setlocal filetype=tex - - """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " 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*$/ @@ -152,40 +154,33 @@ au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/ " Line wrap crippled with numbers shown au Filetype man setlocal nonumber -" Java completion -au FileType java setlocal omnifunc=javacomplete#Complete -au FileType java JCEnable -" See https://github.com/artur-shaik/vim-Javacomplete2 -" ji ji -nmap (JavaComplete-Imports-AddSmart) -imap (JavaComplete-Imports-AddSmart) -" ii jii -nmap (JavaComplete-Imports-Add) -imap (JavaComplete-Imports-Add) -" I jI -nmap (JavaComplete-Imports-AddMissing) -imap (JavaComplete-Imports-AddMissing) -" R jR -nmap (JavaComplete-Imports-RemoveUnused) -imap (JavaComplete-Imports-RemoveUnused) - " Minimum indenting for source code au FileType java,cpp,c,cs let g:detectindent_min_indent = 4 +" Consider using localvimrc config file or editorconfig instead +"au BufReadPost *.java :DetectIndent + +au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.' +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 +let g:localvimrc_persistent = 1 + au FileType markdown call RagtagInit() let g:detectspelllang_langs = {} let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT'] -"au BufReadPost * :DetectIndent - -au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.' -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 FileType mail let g:VimMailSpellLangs=['de', 'en'] :let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'], \ ['|', 'OBSOLETE(o)', 'WONT(n)'], @@ -196,10 +191,32 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/', \ 'template_default': 'default', \ 'template_ext': '.html'}] +" Java completion +au FileType java setlocal omnifunc=javacomplete#Complete +au FileType java JCEnable +" See https://github.com/artur-shaik/vim-Javacomplete2 +" ji ji +au FileType java nmap (JavaComplete-Imports-AddSmart) +au FileType java imap (JavaComplete-Imports-AddSmart) +" ii jii +au FileType java nmap (JavaComplete-Imports-Add) +au FileType java imap (JavaComplete-Imports-Add) +" I jI +au FileType java nmap (JavaComplete-Imports-AddMissing) +au FileType java imap (JavaComplete-Imports-AddMissing) +" R jR +au FileType java nmap (JavaComplete-Imports-RemoveUnused) +au FileType java imap (JavaComplete-Imports-RemoveUnused) + +let g:VimMailContactsProvider=['khard'] +let g:VimMailContactsCommands={ + \'khard': + \{ 'query' : "khard email --parsable --search-in-source-files", + \'sync': "/bin/true"} + \} """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -runtime macros.vim runtime keymaps.vim if filereadable($HOME . '/.vim/init-local.vim')