1 files changed, 5 insertions, 16 deletions

diff --git a/vimrc-full b/vimrc-full
index 54504ad..fbe7a9d 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -1,15 +1,3 @@
-" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160 iskeyword+=\:
-
-set encoding=utf-8            | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=)
-set t_Co=256                  | " required on some ssh sessions
-" set background=light        | "
-" set term=xtermc             | " may be required on solaris
-" set term=xterm-256color
-" set termguicolors
-
-"=======================================================================================================================
-" MATTER_OF_TASTE:
-"=======================================================================================================================
 set textwidth=120             | " better done with modeline
 set ts=4 sts=4 sw=4 expandtab | " better done with a modeline
 
@@ -35,7 +23,6 @@ set linebreak                 | " wrap long lines at char 'breakat', not inside
 set mouse=n                   | " allow mouse in normal mode only, so one can use the terminals c&p feature in insert mode
 set mousemodel=popup          | " only in gvim: right click opens a popup-menu
 set nocursorcolumn            | " turn visual cursor column off (improves performance)
-set nocursorline              | " turn visual cursor line off (improves performance)
 set nrformats+=alpha          | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers
 set nofoldenable              | " disable folding, because we have zi to toggle foldenable :)
 set exrc                      | " enable exrc, a specific .exrc per project, which can contain usual .vimrc commands
@@ -46,7 +33,7 @@ set foldclose=all             | " automatically fold, when the cursor leaves the
 set foldopen=block,hor,search | " when do we unfold?
 set foldtext=Foldtext()       | "
 set foldnestmax=1             | " top level folding only
-set relativenumber            | " relative line numbers can speed up navigation
+set norelativenumber          | " relative line numbers can speed up navigation, but I could not get used to it till now
 set noshowmode                | " because we are using some powerline derivat
 set nostartofline             | " when scrolling: do not move the cursor to column 1
 set notimeout ttimeout        | " improves performance but is known to cause problems on slow terminals
@@ -71,6 +58,7 @@ set winminwidth=30            | " (and all other windows, so TODO: watch out)
 set tags+=../tags
 " set textwidth=100             | " line length (80 used to be default, but...)
 " set colorcolumn=              | " not used, because we have a :match directive for textwidth
+set undofile                  | " preserve undo history when closing and reopening buffers (see :help undo-persistenece)
 set updatetime=80             | " updates the screen more often
 set viminfo+=%                | " restore buffer list
 set virtualedit=all           | " virtual edit should be default behaviour, because I don't see any reason against
@@ -190,7 +178,7 @@ let g:lightline_buffer_active_buffer_right_icon = ''
 let g:lightline_buffer_separator_icon           = ' '
 
 " lightline-buffer function settings
-let g:lightline_buffer_show_bufnr               = 1
+let g:lightline_buffer_show_bufnr               = 0
 let g:lightline_buffer_rotate                   = 0
 let g:lightline_buffer_fname_mod                = ':t'
 let g:lightline_buffer_excludes                 = ['vimfiler']
@@ -231,7 +219,7 @@ let g:lightline = {
     \   },
     \   'tabline': {
     \     'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
-    \     'right': [ [ 'close' ], [ 'getcwd', 'gitbranch'] ],
+    \     'right': [ [ 'close' ] ],
     \   },
     \   'component': {
     \           'tagbar': '%{tagbar#currenttag("%s", "", "f")}',
@@ -528,6 +516,7 @@ if !has('nvim')       | " settings which have been removed from neovim
   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 nottybuiltin    | " use external termcaps
   " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
   "
   let g:loaded_ruby_provider = 1 " disable ruby support