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

diff --git a/init.vim b/init.vim
index 74aa3d3..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,120 +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
-
-if filereadable($HOME . '/.vim/lowendbox')
-    let g:lowendbox = 1
-else
-    let g:lowendbox = 0
+if has('nvim-0.7')
+  set laststatus=3
 endif
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" 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.11')
+  lua<<EOF
+    vim.diagnostic.config({
+        -- virtual_text = true,
+        -- virtual_lines = true,
+        virtual_lines = { current_line = true},
+      })
+EOF
 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
-endif
-colorscheme gruvbox
-
-" let NERDTreeWinPos="right"
-let NERDTreeHijackNetrw=0
-let NERDTreeWinSize=22
-let NERDTreeQuitOnOpen=1
-"au VimEnter * if !argc() | Startify | NERDTree | wincmd w
-
-if $USER != "root" && g:lowendbox == 0
-    let g:neomake_c_enabled_makers = ['clangtidy', 'clangcheck']
-    let g:neomake_cpp_enabled_makers = ['clangtidy', 'clangcheck']
-    let g:clang_compilation_database = '.'
-
-    " Taken from neomake
-    if OnBattery()
-        call neomake#configure#automake('w')
-    else
-        call neomake#configure#automake('nw', 1000)
-    endif
-
-    " 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()
-endif
-
-"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
 
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -158,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
@@ -172,32 +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
+" General settings
 
-source ~/.vim/init-plugins.vim
 
-runtime keymaps.vim
+" 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