X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=3255e3322a503d45f5163506cfb447da63908e7b;hp=1ad51f0919f22a0ae6a895a8e38fe8dbb8a3cba6;hb=HEAD;hpb=7f498c772a10c93b990fbad65b4c54f35ad1f00a

diff --git a/init.vim b/init.vim
index 1ad51f0..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,19 +42,29 @@ 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
+if has('nvim-0.7')
+  set laststatus=3
+endif
 
-if filereadable($HOME . '/.vim/lowendbox')
-    let g:lowendbox = 1
-else
-    let g:lowendbox = 0
+if has('nvim-0.11')
+  lua<<EOF
+    vim.diagnostic.config({
+        -- virtual_text = true,
+        -- virtual_lines = true,
+        virtual_lines = { current_line = true},
+      })
+EOF
 endif
 
+syntax on
+
 runtime macros.vim
 runtime keymaps.vim
 runtime plugsetup.vim
@@ -60,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
@@ -78,38 +95,16 @@ au BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
 
 au FileType cpp,c packadd termdebug
 
-augroup autofoldcolumn
-  au!
-  au CursorHold,BufWinEnter * AutoOrigamiFoldColumn
-augroup END
-
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " General settings
 
 
-" 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()
-
 " termdebug split windows
 let g:termdebug_wide = 1
 let termdebugger = $HOME . '/.vim/gdb.sh'
 
+
+if filereadable($HOME . '/.vim/init-local.vim')
+  source ~/.vim/init-local.vim
+endif