From 16bc2290e1fad3db8a4116f5c61df91d9fd02b12 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Wed, 22 Dec 2021 10:40:52 +0100 Subject: [PATCH] plugins: Move out configs from init.vim --- init.vim | 132 ++++++++------------------------- plugins-noroot-nolowendbox.vim | 60 +++++++++++++++ plugins-noroot.vim | 16 ++++ plugins.vim | 57 +++++++------- 4 files changed, 130 insertions(+), 135 deletions(-) diff --git a/init.vim b/init.vim index 88538fd..414b3ff 100644 --- a/init.vim +++ b/init.vim @@ -41,115 +41,16 @@ 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 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 -endif - +runtime macros.vim +runtime keymaps.vim 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 - -let g:vim_markdown_frontmatter=1 -let g:vim_markdown_math=1 - """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Some filetype-specific settings @@ -193,6 +94,31 @@ augroup END """""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Some global keymaps +" 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' -runtime keymaps.vim diff --git a/plugins-noroot-nolowendbox.vim b/plugins-noroot-nolowendbox.vim index 4c9c4d7..602724e 100644 --- a/plugins-noroot-nolowendbox.vim +++ b/plugins-noroot-nolowendbox.vim @@ -31,6 +31,14 @@ Plug 'hail2u/vim-css3-syntax', {'for': ['scss', 'css']} Plug 'https://gitlab.com/dbeniamine/vim-mail' Plug 'Konfekt/vim-DetectSpellLang', {'do': 'spell'} +" 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 +endif + Plug 'ryanoasis/vim-devicons', Cond(g:enable_plugin_devicons) Plug 'joom/latex-unicoder.vim', {'on': 'Unicoder'} @@ -48,6 +56,26 @@ endif function PluginsNorootNolowendboxConfig() + 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() " The denite settings are largely stolen from spacevim let s:denite_options = { @@ -180,4 +208,36 @@ lua <