1 files changed, 86 insertions, 120 deletions

diff --git a/vimrc-full b/vimrc-full
index 6cba120..8a5cb9e 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -128,7 +128,7 @@ if has("gui_running")
   set guioptions+=m   | " remove menu
   set guioptions-=e   | " do not display tabs
   set guioptions-=L   | " do not show left scrollbar
-  set guioptions-=r   | " do not show right scrollbar
+  set guioptions+=r   | " do not show right scrollbar
   set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
 " set selectmode=mouse,key,cmd  | " enters vim's select mode when pressing shift-left or shift-END
 " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
@@ -136,7 +136,7 @@ if has("gui_running")
 
   " its possible to define alternative fonts (order matters)
   set guifont=
-  set guifont+=Droid\ Sans\ Mono\ for\ Powerline
+  set guifont+=Droid\ Sans\ Mono\ for\ Powerline\ 10
   set guifont+=Source\ Code\ Pro\ for\ Powerline\ SemiBold\ 10
   set guifont+=Dejavu\ Sans\ Mono\ for\ Powerline\ Semibold
   set guifont+=Meslo\ LG\ M\ for\ Powerline\ 10
@@ -182,8 +182,6 @@ set nowrap                    | " but do not (by default) wrap long lines around
 set number                    | " turn line numbers on/off (performance decreases when they are shown)
 set pumheight=8               | " Determines the maximum number of items to show in the popup menu for
 set path+=**                  | " allow recursive searches for files
-" set restorescreen             | " restores the console after exiting vim
-" set shada+=n~/.vim/shada      | " shada file to use
 set scrolljump=5              | " how many lines get scrolled into view when cursor reaches the screens edge
 set scrolloff=3               | " keeps cursor centered
 set splitbelow                | " open new windows below the current one (i find that more intuitive)
@@ -208,20 +206,13 @@ set equalalways               | " do not evenly size windows when opening new or
 set nocursorline              | " turn visual cursor line off (improves performance)
 "=======================================================================================================================
 
-if has('autocmd')
-    " autocmd VimEnter * let &t_EI .= "\<Esc>[0 q"
-    " autocmd VimEnter * let &t_SI = "\<Esc>]12;green\x7"
-    autocmd VimLeave * silent !echo -ne "\033]112\007"
-endif
-
-
-
 " NEOVIM_incompatible:
 " 
 if has('nvim') " Neovim?
   autocmd TermOpen term://* set nobuflisted
   " use default ESC key to leave insert mode in the internal terminal emulator
   tnoremap <Esc> <C-\><C-n>
+" set shada+=n~/.vim/shada      | " shada file to use
 else           " default Vim?
   autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
 
@@ -230,6 +221,7 @@ else           " default Vim?
   set ttyfast         | " improves speed for terminal vim (incomp. with nvim)
   set nottybuiltin    | " use external termcaps
   " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
+  set restorescreen   | " restores the console after exiting vim (intentionally not in nvim)
   "
   let g:loaded_ruby_provider = 1 " disable ruby support
   let g:loaded_python_provider = 1  " disable pthon3
@@ -245,18 +237,6 @@ if has("autocmd")
   " set default completion function in case YouCompleteMe cannot help
   set omnifunc=syntaxcomplete#Complete
 
-  " automatically reload this file when it gets edited
-  if !exists("*OnConfigChange")
-      function OnConfigChange()
-          autocmd! |" Remove all vimrc autocommands
-          source $MYVIMRC
-          exec lightline#colorscheme()
-          exec lightline#update()
-          " AirlineRefresh
-      endfunction
-      autocmd BufWritePost $MYVIMRC call OnConfigChange()
-  endif
-
   augroup set_window_title " {
     " autocmd BufWinEnter quickfix setl statusline=%t
     " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]"
@@ -275,6 +255,35 @@ if has("autocmd")
     endif
   augroup END
 
+  augroup ChangeIcon
+    "if filereadable("/usr/bin/xseticon")
+    "if filereadable("~/.vim/nvim.png")
+    " autocmd VimEnter * silent :execute "!xseticon -id $WINDOWID ~/.vim/nvim.png"
+    " autocmd VimLeave * silent :execute "!xseticon -id $WINDOWID /usr/share/icons/gnome/32x32/apps/xfce-terminal.png"
+    "endif
+    "endif
+  augroup END
+
+  " Fix terminal title =================================================================================================
+  " autocmd VimEnter * let &t_EI .= "\<Esc>[0 q"
+  " autocmd VimEnter * let &t_SI = "\<Esc>]12;green\x7"
+  autocmd VimLeave * silent !echo -ne "\033]112\007"
+
+  " highlight word under the cursor ====================================================================================
+  let w:m1 = 0
+  function! HighlightWordUnderCursor()
+      if(exists('w:m1') && w:m1 > 0)
+        silent! call matchdelete(w:m1)
+        let w:m1 = 0
+      endif
+      let l:currentword = escape(expand('<cword>'), '.')
+      if(strlen(l:currentword) > 0)
+        let w:m1=100
+        silent! call matchadd('BoldItalic', '\<'.l:currentword.'\>', -1, w:m1)
+      endif
+  endfunction
+  autocmd! CursorHold,CursorHoldI * call HighlightWordUnderCursor()
+
   " hitting K over a keyword shows a help in a buffer.
   " Here we define the commands used to look those keywords up
   " as per file type...
@@ -292,6 +301,7 @@ if has("autocmd")
     " Alt-Up : Move cursor up one tag
     " Alt-Down: Move cursor down one tag
     " leader-=: tidies currently selected tag and subtags and sorts attributes by name (alphabetically)
+    autocmd Filetype html,markdown,xml iabbrev </ </<C-X><C-O>
     autocmd Filetype html,htmldjango,xml
       \ :nnoremap
               \ <M-Down>
@@ -304,15 +314,6 @@ if has("autocmd")
               \ vat:'<,'>!tidy -xml --wrap 0 --sort-attributes alpha 2>/dev/null<CR>vat=
   augroup END
 
-  augroup ChangeIcon
-    "if filereadable("/usr/bin/xseticon")
-    "if filereadable("~/.vim/nvim.png")
-    " autocmd VimEnter * silent :execute "!xseticon -id $WINDOWID ~/.vim/nvim.png"
-    " autocmd VimLeave * silent :execute "!xseticon -id $WINDOWID /usr/share/icons/gnome/32x32/apps/xfce-terminal.png"
-    "endif
-    "endif
-  augroup END
-
   " autocmd BufNewFile set nobuflisted
   " use the shada/viminfo file to return the cursor to where it was...
   function! ReturnCursor()
@@ -347,23 +348,13 @@ if has("autocmd")
       endif
     endfunction
 
+    nmap <script> <silent> <F2> :call QFixToggle(0)<CR>
     nmap <script> <silent> <F3> :call ToggleQuickFix()<CR>
-    nmap <script> <silent> <F4> :call QFixToggle(0)<CR>
   augroup END
 
-
-  augroup extra_whitespace " {
-    highlight ExtraWhitespace ctermbg=red ctermfg=white guibg=red
-    " autocmd BufEnter * syn match ExtraWhitespace /\s\+$/
-    " autocmd BufEnter * match ExtraWhitespace /\s\+$/
-  augroup END "}
-
   augroup CurrentFileName
-    highlight CurrentFileName ctermbg=yellow guibg=yellow
-
-
     " highlight the current files name inside the document...
-    let @g = ":exe ':match CurrentFileName /'.escape(expand('%:t'), '.').'/'"
+    let @g = ":exe ':match IncSearch /'.escape(expand('%:t'), '.').'/'"
     " put the current files name after the cursor...
     let @f = ":exe ':normal a'.expand('%:t')"
 
@@ -372,8 +363,6 @@ if has("autocmd")
 
     let @l = ":let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}|:SignifyRefresh"
 
-
-
     if has('menu')
         source $VIMRUNTIME/menu.vim
         set wildmenu
@@ -395,7 +384,7 @@ if has("autocmd")
 
         menu &Verify.&Textwidth\ and\ white\ space
         \ :execute ':match ColorColumn /\%>'.&textwidth.'v./'<CR>
-        \ :2match ExtraWhitespace /\s\+$/<CR>
+        \ :2match IncSearch /\s\+$/<CR>
 
         menu &Verify.Highlight\ current\ file\ name
         \ :execute ':match ColorColumn /'.escape(expand('%:t'), '.').'/'<CR>
@@ -410,9 +399,12 @@ if has("autocmd")
         menu &Window.Scratch
         \ :Scratch<CR>
 
-        menu &Go.file\ under\ the\ cursor<Tab>:gf
+        menu &Find.file\ under\ the\ cursor<Tab>:gf
         \ gf
 
+
+        " menu &Find.Open\ search\ results\ in\ location\ list<Tab>:gf
+        " \ :vimgrep /<C-R>\//g % | copen
     endif
 
 
@@ -475,36 +467,23 @@ endif
 
 
 
+" ======================================================================================================================
 " START: LOADING PLUGINS
 " ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 call plug#begin()
+" Colorschemes:
+Plug 'chriskempson/base16-vim'        | " not just one high quality color scheme (all named base16-*)
 
-Plug 'tpope/vim-surround'             | " plugin makes cs"' inside a line replace " with '
+Plug 'mhinz/vim-signify'              | " uses the sign column to indicate added, modified and removed lines
 Plug 'tpope/vim-fugitive'             | " the most complete GIT integration plugin
 Plug 'godlygeek/tabular'              | " align code on a sign, like :Tab/=
-Plug 'mhinz/vim-signify'              | " uses the sign column to indicate added, modified and removed lines
+Plug 'tpope/vim-surround'             | " plugin makes cs"' inside a line replace " with '
 let g:signify_vcs_list = [ 'git' ]    | " use signify only with git (improves speed when loading buffers, see :h signify)
 let g:signify_cursorhold_insert     = 1
 let g:signify_cursorhold_normal     = 1
 let g:signify_update_on_bufenter    = 0
 let g:signify_update_on_focusgained = 1
 
-" TESTING:                            | " plugins which I am currently trying...
-" Plug 'rkitover/vimpager'
-" found this command instead (use as PAGER):
-" man -P 'nvim -R -u NORC -c":%!col -b" -c":set buftype=nowrite filetype=man" -' ls
-"
-" Plug 'Shougo/neocomplete.vim'       | " alternative to YouCompleteMe in some cases
-" Plug 'tpope/vim-characterize'       | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
-
-" Colorschemes:
-Plug 'chriskempson/base16-vim'        | " not just one high quality color scheme (all named base16-*)
-" Plug 'ryanoasis/vim-devicons'         | " eye candy icons
-
-" SCRATCH:                            | " Unobtrusive scratch window
-Plug 'mtth/scratch.vim'
-nnoremap <F2> :ScratchPreview<CR>
-
 " BUFEXPLORER:                        | " a buffer to list all buffers has the advantage, that default /-searches work in there
 Plug 'jlanzarotta/bufexplorer'
 nnoremap <F12> :ToggleBufExplorer<CR>
@@ -519,24 +498,23 @@ let NERDTreeMinimalUI             = 1
 let NERDTreeShowBookmarks         = 1 | " show bookmarks by default (when opening for the first time)
 let NERDTreeWinSize               = 40
 
-
 " depending on if NERDTree has the focus:
 nnoremap <expr>
-      \ <leader><leader>
-      \ bufwinnr("%")==g:NERDTree.GetWinNum() ? ':NERDTreeClose<CR>' : ':NERDTreeFind<CR>'
+       \ <leader><leader>
+       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? ':NERDTreeClose<CR>' : ':NERDTreeFind<CR>'
 nnoremap <expr>
-      \ <Tab>
-      \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':bn<CR>'
+       \ <Tab>
+       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':bn<CR>'
 nnoremap <expr>
-      \ <S-Tab>
-      \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':bp<CR>'
+       \ <S-Tab>
+       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':bp<CR>'
 " close NERDTree if it is the last remaining window (taken from the official documentation)
 " autocmd bufenter *
 "       \ if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 "
 
 " Additional: ========================================.
-Plug 'sheerun/vim-polyglot'                           " better syntax highlighting/indentation for multiple languages
+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                 = "@"
@@ -548,20 +526,19 @@ let g:javascript_conceal_static               = "•"
 let g:javascript_conceal_super                = "Ω"
 let g:javascript_conceal_arrow_function       = "⇒"
 
-Plug 'majutsushi/tagbar'                              " superseeds taglist-plus, which isn't maintained any more
+Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more
 let g:tagbar_autoclose   = 0
 let g:tagbar_autofocus   = 1
 let g:tagbar_autoshowtag = 0
 let g:tagbar_compact     = 1
 let g:tagbar_indent      = 0
 let g:tagbar_foldlevel   = 99
-nnoremap <leader>l :TagbarToggle<CR>|                 " bind TagBar to Hotkey Ctrl+L
-nnoremap <F9> :TagbarToggle<CR>|                      " also bind TagBar to Hotkey F9
+
+nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to hotkey F9
 
 
-" AIRLINE: a fancy status line =========================================================================================
-set laststatus=2                                        | " required by AirLine, without status line does not appear until a window split
-set background=light
+" LIGHTLINE: a fancy status line =======================================================================================
+set laststatus=2  | " required by AirLine and Lightline, without status line does not appear until a window split
 
 Plug 'itchyny/lightline.vim'
 Plug 'taohex/lightline-buffer'
@@ -685,12 +662,6 @@ if has("python")
   "let g:UltiSnipsJumpBackwardTrigger = '<PageUp>'| " \
   "let g:UltiSnipsListSnippets        = '<leader><leader>'| " YouCompleteMe includes those, so this isn't necessary
 
-  " Plug 'rhysd/vim-clang-format'
-  Plug 'kana/vim-operator-user' " dependency, which allows overriding the = operator for indentation
-  autocmd FileType c,cpp,objc map <buffer> = :pyf /usr/share/clang/clang-format.py<CR>
-  " let g:clang_format#detect_style_file     = 1
-  " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format)
-
   " JEDI: ==============================================================================================================
   Plug 'davidhalter/jedi-vim'               " jedi gets used to display python function signatures
   let g:jedi#completions_enabled        = 0 " we do not need completions, because we have YouCompleteMe
@@ -703,6 +674,22 @@ if has("python")
   " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
 endif
 
+"=======================================================================================================================
+" TESTING:                            | " plugins which I am currently trying...
+"=======================================================================================================================
+" Plug 'rhysd/vim-clang-format'     | unnecessary, because we can just :pyf /usr/share/clang/clang-format.py
+Plug 'kana/vim-operator-user' " dependency, which allows overriding the = operator for indentation
+autocmd FileType c,cpp,objc map <buffer> = :pyf /usr/share/clang/clang-format.py<CR>
+" let g:clang_format#detect_style_file     = 1
+" autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format)
+ 
+" Plug 'tpope/vim-characterize'       | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
+" Plug 'rkitover/vimpager'
+" found this command instead (use as PAGER):
+" man -P 'nvim -R -u NORC -c":%!col -b" -c":set buftype=nowrite filetype=man" -' ls
+
+
+"=======================================================================================================================
 call plug#end()                                       | " all plugins are getting loaded on this line, don't remove!
 " ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑
 " END: LOADING PLUGINS
@@ -724,16 +711,17 @@ let g:netrw_winsize       = 20      | " window size in percent
 
 " ======================================================================================================================
 " COLORSCHEME:
-" uses the default terminal background color as background (allows transparency)
+" ======================================================================================================================
+
 function! ExtendColorTheme()
-  " let g:colors_name=""
-  " set background=light
   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 ctermbg=NONE ctermfg=black
 
   highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE
@@ -754,10 +742,16 @@ function! ExtendColorTheme()
   highlight! TabLineSel ctermbg=blue ctermfg=black
   highlight! link TabLineFill LineNr
   highlight! Search ctermbg=12 ctermfg=0
+
+  " generic, which should exist but don't
+  highlight! Bold cterm=bold gui=bold
   highlight! Italic cterm=italic gui=italic
+  highlight! Underline cterm=underline gui=underline
+  highlight! BoldItalic cterm=Bold,Italic gui=Bold,Italic
 endfunction
 autocmd! ColorScheme * call ExtendColorTheme()
 
+set background=dark | " critical: should be set by the colorscheme, but often is not or gets used by it
 
 if filereadable(expand("~/.config/base16-shell/colortest"))
   let g:base16_shell_path="~/.config/base16-shell/scripts"
@@ -772,37 +766,9 @@ endif
 
 
 " ======================================================================================================================
-let w:m1 = 0
-highlight! BoldItalic cterm=Bold,Italic gui=Bold,Italic
-function! HighlightWordUnderCursor()
-    if(exists('w:m1') && w:m1 > 0)
-      silent! call matchdelete(w:m1)
-      let w:m1 = 0
-    endif
-    let l:currentword = escape(expand('<cword>'), '.')
-    if(strlen(l:currentword) > 0)
-      let w:m1=100
-      silent! call matchadd('BoldItalic', '\<'.l:currentword.'\>', -1, w:m1)
-    endif
-endfunction
-autocmd! CursorHold,CursorHoldI * call HighlightWordUnderCursor()
-
-
+" TESTING:
+" ======================================================================================================================
 " avoids openin an empty buffer when restoring bufferlist from viminfo...
 " if argc() == 0
 "     autocmd VimEnter * nested :silent bun
 " endif
-" au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main
-" Enable omni completion.
-" autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
-" autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
-" auto complete closing tag name when entering </-[space]
-" autocmd Filetype html,markdown,xml iabbrev </ </<C-X><C-O>
-" autocmd FileType python setlocal omnifunc=jedi#completions
-" following autocommands are there to call neovim functions...
-" autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
-" autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-" autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-"
-"
-" set termguicolors