Several optical improvements, nvim compatibility fixes

1 files changed, 31 insertions, 33 deletions

diff --git a/vimrc b/vimrc
index 5ed666d..48f8435 100644
--- a/vimrc
+++ b/vimrc
@@ -15,6 +15,34 @@ Plug 'godlygeek/tabular'                              | " align code on a sign,
 Plug 'mhinz/vim-signify'                              | " show changes in the clutter bar
 
 
+" AIRLINE: ===========================================.
+Plug 'vim-airline/vim-airline'                        | " beautification of the mode line
+set laststatus=2                                      | " required by AirLine, without status line does not appear until a window split
+let g:airline_detect_modified                    = 0  |
+let g:airline_detect_paste                       = 0  |
+let g:airline_exclude_preview                    = 1  |
+let g:airline_extensions                         = ['tabline', 'branch', 'syntastic', 'tagbar']
+let g:airline#extensions#tabline#disable_refresh = 1  |
+let g:airline#extensions#tabline#enabled         = 1  |
+let g:airline#extensions#tabline#fnamemod        = ':t:.' | " let airline just show the filename without its path
+let g:airline#extensions#tabline#show_buffers    = 1  |
+let g:airline#extensions#tabline#show_tabs       = 0  |
+let g:airline#extensions#tagbar#enabled          = 0  |
+let g:airline#extensions#tagbar#flags            = 's'
+let g:airline#extensions#whitespace#enabled      = 0  |
+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='badcat'                          | " specifies which colorscheme should airline uses
+" let g:airline_theme='papercolor'                    | " specifies which colorscheme should airline uses
+
+
 " Colorschemes: ======================================.
 Plug 'ryanoasis/vim-devicons'                         | " eye candy icons
 Plug 'chriskempson/base16-vim'                        | "
@@ -58,34 +86,6 @@ nnoremap <expr>
 nnoremap Q !!$SHELL<CR>
 
 
-" AIRLINE: ===========================================.
-Plug 'vim-airline/vim-airline'                        | " beautification of the mode line
-set laststatus=2                                      | " required by AirLine, without status line does not appear until a window split
-let g:airline_detect_modified                    = 0  |
-let g:airline_detect_paste                       = 0  |
-let g:airline_exclude_preview                    = 1  |
-let g:airline_extensions                         = ['tabline', 'branch', 'syntastic', 'tagbar']
-let g:airline#extensions#tabline#disable_refresh = 1  |
-let g:airline#extensions#tabline#enabled         = 1  |
-let g:airline#extensions#tabline#fnamemod        = ':t:.' | " let airline just show the filename without its path
-let g:airline#extensions#tabline#show_buffers    = 1  |
-let g:airline#extensions#tabline#show_tabs       = 0  |
-let g:airline#extensions#tagbar#enabled          = 0  |
-let g:airline#extensions#tagbar#flags            = 's'
-let g:airline#extensions#whitespace#enabled      = 0  |
-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='badcat'                          | " specifies which colorscheme should airline uses
-" let g:airline_theme='papercolor'                    | " specifies which colorscheme should airline uses
-
-
 " Additional: ========================================.
 Plug 'sheerun/vim-polyglot'                           " better syntax highlighting/indentation for multiple languages
 let g:javascript_conceal_function             = "ƒ"
@@ -109,8 +109,6 @@ let g:tagbar_foldlevel   = 99
 nnoremap <leader>l :TagbarToggle<CR>|                 " bind TagBar to Hotkey Ctrl+L
 
 
-
-
 " Autocompleter: =====================================.
 Plug 'Valloric/MatchTagAlways'                        " highlights the closing tag/brace/...
 Plug 'Valloric/YouCompleteMe'
@@ -279,11 +277,8 @@ set showcmd                   | " essential: show keys of combined commands in t
 set thesaurus+=/home/max/.vim/thesaurus/php.txt
 set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth)
 set ttimeoutlen=10            | " set esc key timeout in ms-
-" set ttyfast                   | " improves speed for terminal vim (incomp. with nvim)
 set updatetime=1000           | " updates the screen more often
-" set ttyscroll=100             | " improves speed for terminal vim, incomp. with nvim
 set writedelay=0
-" set termguicolors             | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
 
 if has("multi_byte")
   scriptencoding utf-8        | " tell vim that we are using utf-8 here
@@ -431,6 +426,9 @@ endif
 
 if !has('nvim')
   set ttymouse=xterm2
+  set ttyscroll=100             | " improves speed for terminal vim, incomp. with nvim
+  set ttyfast                   | " improves speed for terminal vim (incomp. with nvim)
+  set termguicolors             | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
 else
   " shortcut \t opens a terminal in a horizontal split
   nnoremap <leader>t :new +terminal<CR>