X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=init.vim;h=74aa3d385fc52b0c583d400f5d08f873914486ec;hb=68f80c92cc99f2a2a29666b89b0e66259c1c8a7f;hp=75f8c34f1c917612f5b0eaaf8848e0033497b0fe;hpb=a89eb6e1fb9a8f310d64c5bc11ca109a887d4461;p=vimconf.git diff --git a/init.vim b/init.vim index 75f8c34..74aa3d3 100644 --- a/init.vim +++ b/init.vim @@ -6,13 +6,13 @@ " 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 @@ -29,21 +29,26 @@ set smartindent set incsearch set hlsearch +set foldcolumn=4 +set foldlevelstart=20 + set colorcolumn=+1 set mouse=a +set wildmenu set wildmode=longest,list:full set tabpagemax=100 -" Some terminals cause weired symbols due to broken cursor-shape termcodes. -if has('nvim') - "set guicursor= - " Workaround some broken plugins which set guicursor indiscriminately. - "au OptionSet guicursor noautocmd set guicursor= -end - syntax on +" Load some macros +runtime macros.vim + +if filereadable($HOME . '/.vim/lowendbox') + let g:lowendbox = 1 +else + let g:lowendbox = 0 +endif """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Some global plugin settings @@ -58,6 +63,8 @@ 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 @@ -90,8 +97,17 @@ 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 + +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" @@ -100,20 +116,28 @@ 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'] - -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 -let g:deoplete#enable_smart_case = 1 -au InsertEnter * call deoplete#enable() +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! @@ -123,7 +147,6 @@ au InsertEnter * call deoplete#enable() "au FileType tex call pencil#init() "augroup END -let g:vim_markdown_folding_disabled=1 let g:vim_markdown_frontmatter=1 let g:vim_markdown_math=1 @@ -131,13 +154,16 @@ let g:vim_markdown_math=1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " 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,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 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*$/ @@ -146,54 +172,31 @@ 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 - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Some plugin-specific settings - -au FileType markdown call RagtagInit() - -let g:detectspelllang_langs = {} -let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT'] -au BufReadPost *.java :DetectIndent +" 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() -:let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'], - \ ['|', 'OBSOLETE(o)', 'WONT(n)'], - \ ['CANCELED(c)']] +au FileType cpp,c packadd termdebug -let g:vimwiki_list = [{'path': '~/.vimwiki/', - \ 'template_path': '~/.vim/vimwiki/templates', - \ 'template_default': 'default', - \ 'template_ext': '.html'}] +augroup autofoldcolumn + au! + au CursorHold,BufWinEnter * AutoOrigamiFoldColumn +augroup END """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Some plugin-specific settings + +source ~/.vim/init-plugins.vim -runtime macros.vim runtime keymaps.vim if filereadable($HOME . '/.vim/init-local.vim')