1 files changed, 60 insertions, 45 deletions

diff --git a/vimrc b/vimrc
index 538ffe8..1cf91c1 100644
--- a/vimrc
+++ b/vimrc
@@ -3,16 +3,34 @@ call plug#begin()
 " Brilliant_Plugins_by_tpope: ========================.
 Plug 'tpope/vim-sensible'                             | " a sane and modern default configuration
 Plug 'tpope/vim-surround'                             | " plugin makes cs"' inside a line replace " with '
-Plug 'tpope/vim-vinegar'                              | " Improves :Explore
+" Plug 'tpope/vim-vinegar'                              | " Improves :Explore
 " Plug 'tpope/vim-characterize'                       | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
 " Plug 'tpope/vim-fugitive'                           | " the most complete GIT integration plugin
 " Plug 'tpope/vim-repeat'                             | " lets . (dot) repeat plugin macros as well, specifically vim-surround
 
 " Colorschemes: ======================================.
-Plug 'nelstrom/vim-mac-classic-theme'                 | " light theme
-Plug 'Valloric/vim-valloric-colorscheme'              | "
-Plug 'chriskempson/vim-tomorrow-theme'                | "
 Plug 'chriskempson/base16-vim'                        | "
+map <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>.
+
+" NETRW: =============================================.
+" let g:netrw_list_hide     = '\(^\|\s\s\)\zs\.\S\+'    | " directly from the netrw-vim-docu (why isn't it default?)
+let g:netrw_list_hide     = '^\..*'                   | " Explore mode: hide files starting with dot
+let g:netrw_hide          = 1                         | " show not-hidden files only
+let g:netrw_liststyle     = 3                         | " 3=tree
+let g:netrw_banner        = 0                         | " display help messages?
+let g:netrw_winsize       = 20                        | " window size in percent
+let g:netrw_fastbrowse    = 2                         | " manually refresh direcory list (avoids display errors)
+let g:netrw_keepdir       = 0
+let g:netrw_browse_split  = 4                         | " 4=open in previous window
+let g:netrw_preview       = 0                         | "
+let g:netrw_alto          = 0                         | " open files on the right
+let g:netrw_altv          = 1                         | " open files on the right
+
+" let g:netrw_retmap        = 1
+" let g:netrw_silent        = 1
+" let g:netrw_special_syntax= 1
+" let g:netrw_preview       = 0
+" let g:netrw_chgwin        = 2
 
 " AIRLINE: ===========================================.
 Plug 'vim-airline/vim-airline'                        | " beautification of the mode line
@@ -32,46 +50,44 @@ let g:airline#extensions#wordcount#enabled       = 0  |
 let g:airline_inactive_collapse                  = 1  |
 let g:airline_powerline_fonts                    = 1  |
 let g:airline_section_c                          = '%F'
+
 " AIRLINE_Theme: =====================================.
 Plug 'vim-airline/vim-airline-themes'                 | " airline themes to match any light and dark terminal using :AirlineTheme
 let g:airline_theme='base16'                          | " specifies which colorscheme should airline uses
-" let g:airline_theme='bubblegum'                     | " specifies which colorscheme should airline uses
-" let g:airline_theme='dark'                          |
-" let g:airline_theme='luna'                          | " specifies which colorscheme should airline uses
 " let g:airline_theme='papercolor'                    | " specifies which colorscheme should airline uses
-" let g:airline_theme='tomorrow'                      | " specifies which colorscheme should airline uses
 
 " Additional: ========================================.
-Plug 'sheerun/vim-polyglot'                           | " better syntax highlighting/indentation for multiple languages
-Plug 'taglist-plus'                                   | " quick code navigator
+Plug 'sheerun/vim-polyglot'                           " better syntax highlighting/indentation for multiple languages
+Plug 'taglist-plus'                                   " quick code navigator
+nnoremap <C-l> :TlistToggle<CR>|                      " bind TagList to Hotkey Ctrl+L
 
 " Autocompleter: =====================================.
 Plug 'Valloric/MatchTagAlways'
 Plug 'Valloric/YouCompleteMe'
-let g:ycm_error_symbol                        = '✖' " insert this as an error symbol in the gutter bar
-let g:ycm_warning_symbol                      = '➔' " insert this as a warning symbol in the gutter bar
-let g:ycm_collect_identifiers_from_tags_files = 1   " Let YCM read tags from Ctags file
-let g:ycm_use_ultisnips_completer             = 1   " Default 1, just ensure
-let g:ycm_seed_identifiers_with_syntax        = 1   " Completion for programming language's keyword
-let g:ycm_complete_in_comments                = 1   " Completion in comments
-let g:ycm_complete_in_strings                 = 1   " Completion in string
+let g:ycm_error_symbol                        = '✖'   " insert this as an error symbol in the gutter bar
+let g:ycm_warning_symbol                      = '➔'   " insert this as a warning symbol in the gutter bar
+let g:ycm_collect_identifiers_from_tags_files = 1     " Let YCM read tags from Ctags file
+let g:ycm_use_ultisnips_completer             = 1     " Default 1, just ensure
+let g:ycm_seed_identifiers_with_syntax        = 1     " Completion for programming language's keyword
+let g:ycm_complete_in_comments                = 1     " Completion in comments
+let g:ycm_complete_in_strings                 = 1     " Completion in string
 Plug 'scrooloose/syntastic'
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
-let g:LatexBox_latexmk_preview_continuously = 1
-let g:LatexBox_viewer                       = "evince"
-let g:syntastic_always_populate_loc_list    = 1
-let g:syntastic_auto_loc_list               = 1
-let g:syntastic_check_on_open               = 1
-let g:syntastic_check_on_wq                 = 0
-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
-let g:jedi#show_call_signatures             = 1       | " which sadly does not support signatures like jedi
-let g:jedi#show_call_signatures_delay       = 0
-let g:jedi#auto_vim_configure               = 0
-Plug 'SirVer/ultisnips'                               | " replaces loremipsum (and many more)
-Plug 'honza/vim-snippets'                             | " dependency of ultisnips
+let g:LatexBox_latexmk_preview_continuously   = 1
+let g:LatexBox_viewer                         = "evince"
+let g:syntastic_always_populate_loc_list      = 1
+let g:syntastic_auto_loc_list                 = 1
+let g:syntastic_check_on_open                 = 1
+let g:syntastic_check_on_wq                   = 0
+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
+let g:jedi#show_call_signatures               = 1     " which sadly does not support signatures like jedi
+let g:jedi#show_call_signatures_delay         = 0
+let g:jedi#auto_vim_configure                 = 0
+Plug 'SirVer/ultisnips'                               " replaces loremipsum (and many more)
+Plug 'honza/vim-snippets'                             " dependency of ultisnips
 " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
 "" Ultisnips
 let g:UltiSnipsExpandTrigger="<c-tab>"
@@ -86,6 +102,9 @@ let g:UltiSnipsEditSplit="vertical"
 " Plug 'indenthtml.vim'                               | " works better with mixed html/css/javascript
 " Plug 'evanmiller/nginx-vim-syntax'                  | " TODO: check if now included in syntastic?
 
+" autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/
+
+
 call plug#end()                                       | " all plugins are getting loaded on this line, don't remove!
 
 filetype on
@@ -97,15 +116,11 @@ syntax sync minlines=60       | " how many preceding lines will be parsed? (has
 
 let base16colorspace=256
 colorscheme base16-phd
-" colorscheme Tomorrow
-" colorscheme Tomorrow-Night
-" colorscheme Tomorrow-Night
-" colorscheme Tomorrow-Night-Blue
-" colorscheme Tomorrow-Night-Bright
+" colorscheme base16-embers
+" colorscheme base16-flat
+" colorscheme base16-summerfruit-dark
+" colorscheme base16-tommorow
 " colorscheme base16-default-dark
-" colorscheme mac_classic       | " finally set which colorscheme to use
-" colorscheme pencil
-" colorscheme valloric
 " colorscheme vividchalk       | " finally set which colorscheme to use
 
 " Shortcut mods =======================================.
@@ -114,9 +129,8 @@ inoremap <C-Space> <C-x><C-o>
 " keep selection when indenting a selected block:
 vnoremap < <gv
 vnoremap > >gv
-nnoremap <C-Tab> :bn<CR>|         " lets one use CTRL+Tab to switch between tabs
-nnoremap <C-S-Tab> :bp<CR>|       " use CTRL+Shift+Tab to switch to preview tab
-nnoremap <C-l> :TlistToggle<CR>|  " bind TagList to Hotkey Ctrl+L
+nnoremap <C-Tab> :bn<CR>|         " lets one use CTRL+Tab to switch between buffers
+nnoremap <C-S-Tab> :bp<CR>|       " use CTRL+Shift+Tab to switch to previous buffers
 
 " settings ============================================.
 " set shell=/bin/bash           | " many scripts rely on bash, but its path varies why it is commented out here
@@ -136,7 +150,7 @@ set clipboard=unnamedplus     | " makes copy and paste work (autoselectplus migh
 set nonumber                  | " turn line numbers off (improves performance)
 set nocursorline              | " turn visual cursor line off (improves performance)
 set nocursorcolumn            | " turn visual cursor column off (improves performance)
-set ttyscroll=100               | " improves speed for terminal vim
+set ttyscroll=100             | " improves speed for terminal vim
 set ttyfast                   | " improves speed for terminal vim
 set lazyredraw                | " disables redraw during macro exectution (improves performance)
 set re=1
@@ -145,13 +159,12 @@ set nofoldenable              | " disable code folding. I hate code folding
 set spell spelllang=en,de     | " enable spell checker
 set nostartofline             | " when scrolling: do not move the cursor to column 1
 set thesaurus+=/home/max/.vim/thesaurus/php.txt
+set hlsearch                  | " highlights all search matches (not as performant!)
 
 
 
 set splitbelow                | " open new windows below the current one (i find that more intuitive)
 set laststatus=2
-set nocursorcolumn
-set nocursorline
 set norelativenumber
 set writedelay=0
 
@@ -216,7 +229,9 @@ if has("autocmd")
 
   augroup visual_mode_shows_unprintable " {
     set list                      | " shows unprinable characters in the current line
-    autocmd ColorScheme * highlight NonText ctermbg=0 guifg=#061229
+    " set cursorline              | " use setcursorline in order to highlight non printable chars in the current line
+    autocmd ColorScheme * highlight NonText ctermbg=0 gui=bold guifg=#061229
+    autocmd ColorScheme * highlight CursorLineNr  term=bold ctermfg=Yellow gui=bold guifg=Yellow
     "
     "
     " highlight NonText guifg=#1d1f21 | " make non printable chars invisible. The active line is an exception.