Refactored a lot

1 files changed, 85 insertions, 125 deletions

diff --git a/vimrc-full b/vimrc-full
index 468c505..7512908 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -1,4 +1,4 @@
-" vim: noai:ts=2:sw=2:sts=2 iskeyword+=\:,\!,\<,\>,\-,\& number
+" vim: noai:ts=2:sw=2:sts=2 iskeyword+=\:,\<,\>,\-,\& number
 
 "=======================================================================================================================
 " GENERAL:
@@ -64,7 +64,7 @@ if has("multi_byte")
   set listchars+=tab:▏\      | "
   set listchars+=trail:·     | " symbols used when using :set list (which displays non-printable chars)
   " set listchars+=eol:↲     | " symbols used when using :set list (which displays non-printable chars)
-  set listchars+=space:·   | " symbols used when using :set list (which displays non-printable chars)
+  " set listchars+=space:·     | " symbols used when using :set list (which displays non-printable chars)
   set showbreak+=›           | " symbol used in the beginning of a wrapped line
 
   " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
@@ -235,13 +235,15 @@ set complete+=i " scan current and included files
 set complete+=d " scan current and included files for defined name or macro
 set complete+=d               | " scan current and included files for defined name or macro
 set complete+=i               | " scan current and included files for completions
+set completeopt+=noinsert     | " Do not insert any text for a match until the user selects one
+set completeopt+=noselect     | " Do not select a completion from the menu, let the user do that
 set tagcase=match             | " tagcase match, because we mostly use ^] to jump around and that variant respects the upper/lower case [followscs, followic, match, ignore]
 set tags+=../tags
 
 " code folding...
 set nofoldenable              | " disable folding, because we have zi to toggle foldenable :)
 set foldclose=all             | " automatically fold, when the cursor leaves the folded area
-set foldcolumn=1              | " I think I don't need this second indicator
+set foldcolumn=2              | " I think I don't need this second indicator
 " set numberwidth=5
 " set foldmethod=syntax         | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
 set foldnestmax=1             | " top level folding only
@@ -250,7 +252,7 @@ set foldopen=block,hor,search | " when do we unfold?
 " set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g')
 " set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2)
 " set foldtext=repeat('',indent(v:foldstart)).substitute(substitute(substitute(join(getline(v:foldstart,v:foldend)),'\\s\\s\\+\\\|\[\*\/\]','\ ','g'),'\^\\s\\+','','g'),\ '\\s\\s\\+',\ '\ ',\ 'g')
-set foldtext=printf('%*s%.*S',indent(v:foldstart),'',&textwidth-indent(v:foldstart),substitute(substitute(join(getline(v:foldstart,v:foldend),'\ '),'[[:space:]]\\+','\ ','g'),'^[[:space:]]','','g'))
+set foldtext=printf('%*s%.*S',indent(v:foldstart),'',&textwidth-indent(v:foldstart),substitute(substitute(join(getline(v:foldstart,v:foldend),'\ '),'[[:space:]]\\+','\ ','g'),'^[[:space:]*]','','g'))
 
 " works ...
 " set foldexpr=match(synIDattr(synID(v:lnum,indent(v:lnum)+1,0),'name'),'Comment')>-1
@@ -403,7 +405,7 @@ if has("autocmd")
       autocmd FileType c,cpp  set grepformat=%f:%l:%c:%m
     endif
 
-    autocmd BufWinEnter * if &previewwindow | setlocal nonumber signcolumn=no filetype=c nobuflisted | endif
+    autocmd BufWinEnter * if &previewwindow | setlocal nonumber nolist signcolumn=no filetype=c nobuflisted | endif
 
 
     " autocmd FileType c,cpp  setlocal iskeyword-=_
@@ -704,12 +706,12 @@ let g:signify_cursorhold_insert      = 0
 let g:signify_cursorhold_normal      = 0
 let g:signify_update_on_bufenter     = 0
 let g:signify_update_on_focusgained  = 0
-let g:signify_sign_show_count        = 1
+let g:signify_sign_show_count        = 0
 
-let g:signify_sign_add               = '���'
-let g:signify_sign_delete            = '���'
-let g:signify_sign_delete_first_line = '���'
-let g:signify_sign_change            = '���'
+let g:signify_sign_add               = '���'
+let g:signify_sign_delete            = '���'
+let g:signify_sign_delete_first_line = '���'
+let g:signify_sign_change            = '���'
 let g:signify_sign_changedelete      = g:signify_sign_change
 
 
@@ -742,8 +744,6 @@ nnoremap <F4>
 " autocmd bufenter *
 "       \ if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 "
-
-
 " map CTRL-PageUp/Down to next/previous buffer
 " and Shift-PageUp/Down to next/previous arglist file
 nnoremap <C-PageUp> :bn<CR>
@@ -751,21 +751,6 @@ nnoremap <C-PageDown> :bp<CR>
 nnoremap <S-PageUp> :N<CR>
 nnoremap <S-PageDown> :n<CR>
 
-
-" Additional: ========================================.
-" Plug 'sheerun/vim-polyglot'                   " better syntax highlighting/indentation for multiple languages
-" let g:javascript_conceal_function             = "ƒ"
-" let g:javascript_conceal_null                 = "ø"
-" let g:javascript_conceal_this                 = "@"
-" let g:javascript_conceal_return               = "⇚"
-" let g:javascript_conceal_undefined            = "¿"
-" let g:javascript_conceal_NaN                  = "ℕ"
-" let g:javascript_conceal_prototype            = "¶"
-" let g:javascript_conceal_static               = "•"
-" let g:javascript_conceal_super                = "Ω"
-" let g:javascript_conceal_arrow_function       = "⇒"
-
-
 " indent within <script> and <style> (default is a zero indent)
 let g:html_indent_script1 = "inc"
 let g:html_indent_style1 = "inc"
@@ -827,7 +812,8 @@ if has("python") || has('python3')
           \ }
 
     let g:LanguageClient_serverCommands = {
-          \ 'cpp': ['clangd']
+          \ 'cpp': ['clangd'],
+          \ 'c': ['clangd']
           \ }
     " Plug 'roxma/nvim-completion-manager' unmaintained python version
   else
@@ -848,6 +834,10 @@ if has("python") || has('python3')
     let g:ycm_key_list_previous_completion             = ['Up']
     let g:ycm_key_list_select_completion               = ['Down']
 
+    let g:ycm_semantic_triggers = {
+          \   'c': [ 're!\w{2}' ]
+          \ }
+
     " Plug 'vim-scripts/dbext.vim'                       " dependency to allow db related completions
     " let g:ycm_server_python_interpreter                = 'python3'
     " let g:ycm_python_binary_path                       = '/usr/bin/python3' " the python interpreter of choice (for code checking)
@@ -864,7 +854,7 @@ if has("python") || has('python3')
     " let g:ycm_key_list_previous_completion             = ['<Up>']
     " let g:ycm_global_ycm_extra_conf                    = '.ycm_extra_conf.py'
     " let g:ycm_semantic_triggers                        = { 'c': [ 're!.' ] }
-    " " let g:ycm_disable_for_files_larger_than_kb         = 16384 " we have faaast computers, don't we?
+    " let g:ycm_disable_for_files_larger_than_kb         = 16384 " we have faaast computers, don't we?
     " let g:ycm_show_diagnostics_ui                      = 0
     " " disable <tab>-key for YCM so that it can be used with ultisnips
     " let g:ycm_key_list_select_completion=[]
@@ -967,113 +957,89 @@ let g:netrw_winsize       = 20      | " window size in percent
 " ======================================================================================================================
 
 function! ExtendColorTheme()
-  " let g:status_fg=synIDattr(hlID('Cursor'), 'fg#')
-  " let g:status_bg=synIDattr(hlID('Cursor'), 'bg#')
-  " let g:status_sel=synIDattr(hlID('Text'), 'fg#')
-  " let g:status_sel='#ffffff'
-  let g:status_fg='#00aa00'
-  let g:status_bg='#000000'
-  let g:status_sel='#ffff00'
+  filetype on
+  filetype plugin on
+  filetype indent on
+
+  syntax on                     | " enable syntax highlighting
+  syntax sync minlines=60       | " how many preceding lines will be parsed? (has performance impact)
+
+  highlight! SignifySignAdd  ctermbg=NONE
+  highlight! Bold            cterm=bold            gui=bold
+  highlight! Italic          cterm=italic          gui=italic
+  highlight! Underline       cterm=underline       gui=underline
+  highlight! BoldUnderline   cterm=bold,underline  gui=bold,underline
+  highlight! BoldItalic      cterm=bold,Italic     gui=Bold,Italic
+  highlight! Todo            cterm=bold            gui=bold            guibg=#ffffaa  guifg=#000000
+  highlight! Error           ctermbg=NONE          guibg=NONE
+  highlight! SpellBad        cterm=NONE            gui=undercurl       guibg=NONE     guifg=red
+
+
+  highlight! link        SpecialKey                  NonText     | " makes tab stop (see listchars) less disturbing
+  highlight! link        EndOfBuffer                 Ignore
+  highlight! link        WildMenu                    Search
+  highlight! link        Convention                  Error
+  highlight! link        YcmErrorSign                SpellBad
+  highlight! link        YcmWarningSign              Spellbad
+  highlight! link        SignifySignAdd              SignColumn
+  highlight! link        SignifySignChange           SignColumn
+  highlight! link        SignifySignDelete           SignColumn
+  highlight! link        SignifySignChangeDelete     SignColumn
+  highlight! link        SignifySignDeleteFirstLine  SignColumn
+  highlight! link        VertSplit                   NonText
+  highlight! link        LineNr                      Comment
+  highlight! link        Folded                      LineNr
+  highlight! link        SignColumn                  Comment
+  highlight! link        FoldColumn                  Comment
+  highlight! link        PmenuSbar                   Pmenu
+  highlight! PmenuThumb  cterm=inverse
+  highlight! MoreMsg     cterm=inverse
+
+  autocmd InsertEnter * silent! call matchdelete(101)
+  autocmd InsertLeave * silent! call matchadd('Convention', ' \+$', -1, 101, { 'conceal': '⟶' })
+
+  autocmd InsertEnter * set colorcolumn=80,120
+  autocmd InsertLeave * set colorcolumn&
 
   " execute 'highlight! StatusLine'
   "       \ .' guibg=NONE'
   "       \ .' guifg='.g:status_bg
   "       \ .' gui=inverse'
-
+  " let g:status_fg=synIDattr(hlID('Cursor'), 'fg#')
+  " let g:status_bg=synIDattr(hlID('Cursor'), 'bg#')
+  " let g:status_sel=synIDattr(hlID('Text'), 'fg#')
+  " let g:status_sel='#ffffff'
   " " execute 'highlight! User1 gui=NONE'
   " execute 'highlight! User1 guibg='.g:status_sel
   " execute 'highlight! User1 guifg='.g:status_fg
-
   " execute 'highlight! User2 gui=NONE'
   " execute 'highlight! User2 guibg='.g:status_sel
   " execute 'highlight! User2 guifg=NONE'
-
-
-  filetype on
-  filetype plugin on
-  filetype indent on
-
-  syntax on                     | " enable syntax highlighting
-  syntax sync minlines=60       | " how many preceding lines will be parsed? (has performance impact)
-
   " use the default terminal background color as background (allows transparency)
   " highlight! Normal guibg=NONE ctermbg=NONE
   " highlight! NonText guibg=NONE guifg=black ctermbg=NONE ctermfg=black
-
-  " make the ~ (tilde) indicator invisible, which usually marks the EOF
-  highlight! link EndOfBuffer Ignore
-
-  highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE
-  highlight! Pmenu ctermbg=LightYellow ctermfg=DarkGrey
-  highlight! PmenuSel ctermbg=blue ctermfg=LightYellow cterm=bold
-
-  highlight! link PmenuSbar Pmenu
-  highlight! PmenuThumb cterm=inverse
-  highlight! MoreMsg cterm=inverse
-
-  highlight! link LineNr Comment
-  highlight! link Folded Comment
-  highlight! link SignColumn Comment
-  highlight! link FoldColumn Comment
+  " makes the ~ (tilde) indicator invisible, which usually marks the EOF
+  " highlight!  CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE
+  " highlight!  Pmenu ctermbg=LightYellow ctermfg=DarkGrey
+  " highlight!  PmenuSel ctermbg=blue ctermfg=LightYellow cterm=bold
   " highlight! Folded ctermbg=NONE
   " highlight! Cursor guibg=#729fcf ctermbg=yellow
-  highlight! link VertSplit NonText
   " highlight! SpellBad ctermbg=none
-  highlight! SpecialKey ctermfg=19
-  highlight! WhiteSpace ctermfg=19
-
+  " highlight! SpecialKey ctermfg=19
+  " highlight! WhiteSpace ctermfg=19
   " highlight! link TabLine LineNr
   " highlight! TabLineSel ctermbg=blue ctermfg=black
   " highlight! link TabLineFill LineNr
-  highlight! Search ctermbg=LightYellow ctermfg=12 guibg=#fefd86 guifg=#222222
-  highlight! link WildMenu Search
-
+  " highlight! Search ctermbg=LightYellow ctermfg=12 guibg=#fefd86 guifg=#222222
   " generic, which should exist but don't
-  highlight! SignifySignAdd ctermbg=NONE
-  highlight! Bold cterm=bold gui=bold
-  highlight! Italic cterm=italic gui=italic
-  highlight! Underline cterm=underline gui=underline
-  highlight! BoldUnderline cterm=bold,underline gui=bold,underline
-  highlight! BoldItalic cterm=Bold,Italic gui=Bold,Italic
-
-  " make tab stop (see listchars) less disturbing...
-  highlight! link SpecialKey NonText
-
-  " highlight! link LightlineMiddle_tabline ColorColumn
-  " highlight! link LightlineLeft_tabline_1 ColorColumn
-  " highlight! link LightlineLeft_tabline_0_1 ColorColumn
-
-  highlight! Todo guibg=#ffffaa guifg=#000000 gui=bold term=bold
-  highlight! cStatement guifg=red gui=bold term=bold
-
-  highlight! link Convention Error
-
-
-  highlight! link SignifySignAdd             LineNr
-  highlight! link SignifySignChange          LineNr
-  highlight! link SignifySignDelete          LineNr
-  highlight! link SignifySignChangeDelete    LineNr
-  highlight! link SignifySignDeleteFirstLine LineNr
-
-  highlight! SpellBad ctermbg=NONE ctermfg=red cterm=NONE
-  highlight! link YcmErrorSign   SpellBad
-  highlight! link YcmWarningSign Spellbad
-
   " autocmd InsertLeave * call matchadd('Conceal', ' \+$', -1, 101, { 'conceal': '⟶' })
-  autocmd InsertEnter * silent! call matchdelete(101)
-  autocmd InsertLeave * silent! call matchadd('Convention', ' \+$', -1, 101, { 'conceal': '⟶' })
-
   " Show trailing whitepace and spaces before a tab as part of the syntax highlighting
   " autocmd BufEnter,InsertLeave * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
   " autocmd Syntax * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
   " autocmd BufEnter,BufWritePost * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
   " autocmd InsertEnter * syntax clear Convention
   " autocmd BufEnter,InsertLeave * execute ':syntax match Convention /\%>'.&textwidth.'v./ containedin=ALL'
-
-  autocmd InsertEnter * set colorcolumn=80,120
-  autocmd InsertLeave * set colorcolumn&
   " set colorcolumn=                  | " not used, because we have a :match directive for textwidth
-  "
 " if argc() == 0
   " rv
   " autocmd VimEnter * split +bro\ ol
@@ -1113,11 +1079,6 @@ nnoremap Q !!$SHELL<CR>
 " ======================================================================================================================
 " TESTING:
 " ======================================================================================================================
-" avoids openin an empty buffer when restoring bufferlist from viminfo...
-" if argc() == 0
-"     silent autocmd VimEnter * nested :silent bun
-" endif
-
 autocmd TextYankPost * echo '> text yanked to '.(
       \ get(v:event,'regname') == ''
       \ ? 'default register'
@@ -1158,15 +1119,15 @@ augroup status
   let g:symbol_branch        = ''
 
   if &term == "linux"
-    let g:symbol_branch  = ''
+    let g:symbol_branch      = ''
 
-    let g:group_active   = "StatusLineTerm"
-    let g:group_inactive = "StatusLineTermNC"
-    let g:group_tabline  = "StatusLineTerm"
+    let g:group_active       = "StatusLineTerm"
+    let g:group_inactive     = "StatusLineTermNC"
+    let g:group_tabline      = "StatusLineTerm"
   else
-    let g:group_active     = "StatusLine"
-    let g:group_inactive   = "StatusLineNC"
-    let g:group_tabline    = "TabLine"
+    let g:group_active       = "StatusLine"
+    let g:group_inactive     = "StatusLineNC"
+    let g:group_tabline      = "TabLine"
   endif
 
   " this function reverts foreground color and background color of a given
@@ -1204,13 +1165,12 @@ augroup status
     return ''
           \ ."%#StatusLineHighlight#"
           \ ."%#".a:highlight_group."#"
-          \ ."%(%w%h%q%)".' '.l:mode.' '
-          \ .g:status_sym_sep_start.' '
+          \ ."%(%w%h%q%)".' '.l:mode.' '.g:status_sym_sep_start.' '
           \ ."%{(argc()>0\ ?\ argidx()+1.':'.argc().' '.g:status_sym_sep_start.' '\ :\ '')}"
           \ ."%{winbufnr(0).' '.g:status_sym_sep_start}"
-          \ ."%{(&readonly\ ?\ '\ \ \ '\ :\ '')}"
+          \ ."%{(&readonly\ ?\ '\ \ 🔒'\ :\ '')}"
           \ ."%{(&modified\ ?\ '\ \ '.nr2char(0xF0C7).'\ '\ :\ '')\ }"
-          \ ."%{(haslocaldir() ?\ '  '.fnamemodify(getcwd(),\ ':.').' '.nr2char(0xe0b1)\ \:\ '')}\ "
+          \ ."%{(haslocaldir() ?\ fnamemodify(getcwd(),\ ':.').' '.nr2char(0xe0b1)\ \:\ '')}\ "
           \ ."%{(&buftype\ ==\ \"terminal\"\ ?\ has('nvim')?b:term_title:expand(&titlestring)\ :\ substitute(expand('%:p'),\ '^'.getcwd(-1).'/*',\ '',\ ''))\ }"
           \ ."%1(%)"
           \ ."%#".l:invert_group."#"
@@ -1237,8 +1197,8 @@ augroup status
     let l:invert_group = CreateInvertGroup(a:highlight_group)
     return ''
           \ ."%#".a:highlight_group."#"
-          \ ."%3( \ %)"
-          \ ."%{getcwd(-1)}"
+          \ ."%3( \ %)\ "
+          \ ."%{getcwd(-1)}\ "
           \ .g:status_sym_sep_start.' '
           \ ."%(\ ".g:symbol_branch."\ %{fugitive#head()}\ %)"
           \ ."%#".l:invert_group."#"