X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=3255e3322a503d45f5163506cfb447da63908e7b;hp=86f93b3da6befc9866c02fbf7e6f6bb0299d5f6b;hb=HEAD;hpb=451f3958fd30da1bbf577b20b3761429f4050768

diff --git a/init.vim b/init.vim
index 86f93b3..a80a4e8 100644
--- a/init.vim
+++ b/init.vim
@@ -16,6 +16,13 @@ set fillchars=vert:│,fold:\
 set listchars=tab:»­,trail:·,eol:$
 set virtualedit=block
 
+set linebreak
+
+" Use filetype.lua and do not use filetype.vim for >=neovim-0.7.2
+" Attention: Requires migration of ftdetect/ scripts
+" let g:do_filetype_lua = 1
+" let g:did_load_filetypes = 0
+
 filetype plugin indent on
 
 set tabstop=4
@@ -35,113 +42,32 @@ set foldlevelstart=20
 set colorcolumn=+1
 set mouse=a
 set wildmenu
-set wildmode=longest,list:full
+" set wildmode=longest,list:full
+" set wildmode=list:full
+set wildoptions=pum
+set showcmd
 
 set tabpagemax=100
 
-syntax on
-
-" Load some macros
-runtime macros.vim
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Some global plugin settings
-
-" Disable devicons on linux terminal
-if $TERM == 'linux'
-    let g:enable_plugin_devicons=0
-" Enable loading of devicons on all others
-else
-    let g:enable_plugin_devicons=1
+if has('nvim-0.7')
+  set laststatus=3
 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
-" Trailing whitespace
-highlight default link BadWhitespace SpellCap
-
-" Setup BadWhitespace syntax match expressions.
-function SetBadWhitespaceSyntax()
-  " Do not expose bad whitespace in help buffers or for man pages. Or, more
-  " generally, if we open the file readonly.
-  "if &ft != "help" && &ft != "man"
-  if !&readonly
-    " Make trailing whitespace be flagged as bad.
-    syn match BadWhitespace /\s\+$/ containedin=ALL
-    " Make space before tab be flagged as bad and vice versa
-    syn match BadWhitespace / \+\t/ containedin=ALL
-    syn match BadWhitespace /\t \+/ containedin=ALL
-  endif
-endfunction
-
-" Make trailing whitespace be flagged as bad.
-au BufRead,BufNewFile * call SetBadWhitespaceSyntax()
-
-let g:airline_powerline_fonts=1
-let g:airline#extensions#tabline#enabled=1
-let g:airline#extensions#branch#enabled=1
-
-let g:gruvbox_contrast_light='hard'
-let g:gruvbox_contrast_dark='hard'
-set bg=dark
-
-if &term =~ 'linux'
-    let g:gruvbox_termcolors=16
-else
-    " Setting termguicolors has two implications:
-    " - 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
-    let g:gruvbox_italic = 1
+if has('nvim-0.11')
+  lua<<EOF
+    vim.diagnostic.config({
+        -- virtual_text = true,
+        -- virtual_lines = true,
+        virtual_lines = { current_line = true},
+      })
+EOF
 endif
-colorscheme gruvbox
-
-" let NERDTreeWinPos="right"
-let NERDTreeHijackNetrw=0
-let NERDTreeWinSize=22
-let NERDTreeQuitOnOpen=1
-"au VimEnter * if !argc() | Startify | NERDTree | wincmd w
-
-let g:neomake_c_enabled_makers = ['clangtidy', 'clangcheck']
-let g:neomake_cpp_enabled_makers = ['clangtidy', 'clangcheck']
-
-" Taken from neomake
-if OnBattery()
-  call neomake#configure#automake('w')
-else
-  call neomake#configure#automake('nw', 1000)
-endif
-
-let g:clang_compilation_database = '.'
 
-" Speedup deoplete startup time, see deoplete FAQ
-let g:python3_host_prog = '/usr/bin/python3'
-" deoplete requires huge startuptime. Delay loading upon first InsertEnter.
-let g:deoplete#enable_at_startup = 0
-call deoplete#custom#option({
-                            \ 'smart_case' : v:true,
-                            \ 'auto_refresh_delay' : 100,
-                            \ })
-au InsertEnter * call deoplete#enable()
-
-"augroup pencil
-  "au!
-  "au FileType markdown,mkd call pencil#init()
-  "au FileType text         call pencil#init()
-  "au FileType mail         call pencil#init()
-  "au FileType tex          call pencil#init()
-"augroup END
+syntax on
 
-let g:vim_markdown_frontmatter=1
-let g:vim_markdown_math=1
+runtime macros.vim
+runtime keymaps.vim
+runtime plugsetup.vim
 
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -151,7 +77,7 @@ au FileType text,markdown,asciidoc,mail,gitcommit,mediawiki,vimwiki,tex setlocal
 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
@@ -165,152 +91,19 @@ au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
 " Line wrap crippled with numbers shown
 au Filetype man setlocal nonumber
 
-" 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()
 
 au FileType cpp,c packadd termdebug
 
-augroup autofoldcolumn
-  au!
-  au CursorHold,BufWinEnter * AutoOrigamiFoldColumn
-augroup END
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Some plugin-specific settings
-
-let g:localvimrc_persistent = 1
-
-let g:fastfold_minlines = 0
-
-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)'],
-      \ ['CANCELED(c)']]
-
-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
-au FileType java JCEnable
-
-let g:VimMailContactsProvider=['khard']
-let g:VimMailContactsCommands={
-    \'khard':
-    \{ 'query' : "khard email --parsable --search-in-source-files",
-        \'sync': "/bin/true"}
-  \}
-
-let g:vimtex_fold_enabled = 1
-let g:vimtex_fold_levelmarker = '➜'
-
-" The denite settings are largely stolen from spacevim
-let s:denite_options = {
-      \ 'default' : {
-      \ 'winheight' : 15,
-      \ 'mode' : 'insert',
-      \ 'start_filter' : 1,
-      \ 'quit' : 1,
-      \ 'highlight_matched_char' : 'MoreMsg',
-      \ 'highlight_matched_range' : 'MoreMsg',
-      \ 'direction': 'rightbelow',
-      \ }}
-
-augroup spacevim_layer_denite
-  autocmd!
-  autocmd FileType denite call s:denite_my_settings()
-augroup END
-
-function! s:denite_my_settings() abort
-  nnoremap <silent><buffer><expr> i
-        \ denite#do_map('open_filter_buffer')
-  nnoremap <silent><buffer><expr> '
-        \ denite#do_map('toggle_select').'j'
-  nnoremap <silent><buffer><expr> q
-        \ denite#do_map('quit')
-  nnoremap <silent><buffer><expr> <C-t>
-        \ denite#do_map('do_action', 'tabopen')
-  nnoremap <silent><buffer><expr> <C-v>
-        \ denite#do_map('do_action', 'vsplit')
-  nnoremap <silent><buffer><expr> <C-s>
-        \ denite#do_map('do_action', 'split')
-  nnoremap <silent><buffer><expr> <CR>
-        \ denite#do_map('do_action')
-  nnoremap <silent><buffer><expr> p
-        \ denite#do_map('do_action', 'preview')
-  nnoremap <silent><buffer><Tab> j
-  nnoremap <silent><buffer><S-Tab> k
-endfunction
-
-" FIND and GREP COMMANDS
-if executable('rg')
-  " Ripgrep command on grep source
-  call denite#custom#var('grep', 'command', ['rg'])
-  call denite#custom#var('grep', 'default_opts',
-        \ ['--vimgrep', '--no-heading'])
-  call denite#custom#var('grep', 'recursive_opts', [])
-  call denite#custom#var('grep', 'pattern_opt', ['--regexp'])
-  call denite#custom#var('grep', 'separator', ['--'])
-  call denite#custom#var('grep', 'final_opts', [])
-endif
+" General settings
 
-let s:insert_mode_mappings = [
-      \ ['jk', '<denite:enter_mode:normal>', 'noremap'],
-      \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
-      \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
-      \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
-      \ ['<Esc>', '<denite:enter_mode:normal>', 'noremap'],
-      \ ['<C-N>', '<denite:assign_next_matched_text>', 'noremap'],
-      \ ['<C-P>', '<denite:assign_previous_matched_text>', 'noremap'],
-      \ ['<Up>', '<denite:assign_previous_text>', 'noremap'],
-      \ ['<Down>', '<denite:assign_next_text>', 'noremap'],
-      \ ['<C-Y>', '<denite:redraw>', 'noremap'],
-      \ ]
-
-let s:normal_mode_mappings = [
-      \ ["'", '<denite:toggle_select_down>', 'noremap'],
-      \ ['<C-n>', '<denite:jump_to_next_source>', 'noremap'],
-      \ ['<C-p>', '<denite:jump_to_previous_source>', 'noremap'],
-      \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
-      \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
-      \ ['gg', '<denite:move_to_first_line>', 'noremap'],
-      \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
-      \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
-      \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
-      \ ['q', '<denite:quit>', 'noremap'],
-      \ ['r', '<denite:redraw>', 'noremap'],
-      \ ]
 
 " termdebug split windows
 let g:termdebug_wide = 1
 let termdebugger = $HOME . '/.vim/gdb.sh'
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-runtime keymaps.vim
 
 if filereadable($HOME . '/.vim/init-local.vim')
   source ~/.vim/init-local.vim