X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=3255e3322a503d45f5163506cfb447da63908e7b;hp=42ec945324d14eae08fe10e314aff20e6c3991dd;hb=HEAD;hpb=38338d682e26b5f26d7c3f4c65f4ac18666f46e7

diff --git a/init.vim b/init.vim
index 42ec945..a80a4e8 100644
--- a/init.vim
+++ b/init.vim
@@ -1,17 +1,28 @@
 " My personal vim, nvim, gvim configuration
 " Author: Stefan Huber <shuber@sthu.org>
 
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Some global settings
+
 set nocompatible
-set termguicolors
 set number
 set cursorline
 set scrolloff=5
 
 set encoding=utf-8
 
+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
@@ -25,103 +36,74 @@ set smartindent
 set incsearch
 set hlsearch
 
+set foldcolumn=4
+set foldlevelstart=20
+
 set colorcolumn=+1
 set mouse=a
-set wildmode=longest,list:full
-
-if has('nvim')
-    set guicursor=
-end
-
-syntax on
-runtime plugsetup.vim
-
-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'
-let g:gruvbox_italic = 1
-set bg=dark
-colorscheme gruvbox
-
-" let NERDTreeWinPos="right"
-let NERDTreeHijackNetrw=0
-let NERDTreeWinSize=22
-let NERDTreeQuitOnOpen=1
-"au VimEnter * if !argc() | Startify | NERDTree | wincmd w
+set wildmenu
+" set wildmode=longest,list:full
+" set wildmode=list:full
+set wildoptions=pum
+set showcmd
 
-let g:neomake_c_enabled_makers = ['clangtidy', 'clangcheck']
-let g:neomake_cpp_enabled_makers = ['clangtidy', 'clangcheck']
+set tabpagemax=100
 
-call neomake#configure#automake('w')
-"let g:neomake_logfile = '/tmp/neomake.log'
-
-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
-autocmd 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
+if has('nvim-0.7')
+  set laststatus=3
+endif
 
-let g:vim_markdown_folding_disabled=1
-let g:vim_markdown_frontmatter=1
-let g:vim_markdown_math=1
+if has('nvim-0.11')
+  lua<<EOF
+    vim.diagnostic.config({
+        -- virtual_text = true,
+        -- virtual_lines = true,
+        virtual_lines = { current_line = true},
+      })
+EOF
+endif
 
-au FileType markdown call RagtagInit()
+syntax on
 
-let g:guesslang_langs=[ 'en_US', 'de_AT']
-au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
-au BufReadPost * :DetectIndent
+runtime macros.vim
+runtime keymaps.vim
+runtime plugsetup.vim
 
-au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki set fo+=n
 
-au FileType mediawiki setlocal wrap linebreak tw=0
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Some filetype-specific settings
 
-au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
-au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
+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 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 go setlocal shiftwidth=8 tabstop=8 noexpandtab
+au Filetype tex setlocal shiftwidth=2 tabstop=2
 
+au FileType mediawiki setlocal wrap linebreak textwidth=0
 
 "git scissor line
 au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
 au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
 
-"mutt and neomutt
-au BufRead,BufNewFile ~/.mutt/tmp/*mutt-* set filetype=mail
-au BufRead,BufNewFile *.muttrc set filetype=muttrc
+" Line wrap crippled with numbers shown
+au Filetype man setlocal nonumber
 
-" Some settings for tex files
-au BufRead,BufNewFile *.cls set filetype=tex
-au Filetype tex set shiftwidth=2
+au BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
 
-au BufRead,BufNewFile *.plt set filetype=gnuplot
+au FileType cpp,c packadd termdebug
 
-:let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'],
-      \ ['|', 'OBSOLETE(o)', 'WONT(n)'],
-      \ ['CANCELED(c)']]
 
-let g:vimwiki_list = [{'path': '~/.vimwiki/'}]
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" General settings
 
-" Trailing whitespace
-highlight default link TrailingWhitespace SpellCap
-" Make trailing whitespace be flagged as bad.
-au BufRead,BufNewFile * syn match TrailingWhitespace /\s\+$/ containedin=ALL
 
-runtime macros.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