1 files changed, 41 insertions, 17 deletions

diff --git a/vimrc-full b/vimrc-full
index 63a1e17..0aecf24 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -130,7 +130,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
@@ -201,7 +201,16 @@ set virtualedit=all           | " virtual edit should be default behaviour, beca
 set writedelay=0
 set wildmenu                  | " use a menu in the command line
 set wildmode=longest:full     | " do not preselect any entry and show all possible
-set sessionoptions-=blank
+set sessionoptions=
+set sessionoptions+=buffers
+set sessionoptions+=curdir
+set sessionoptions+=folds
+set sessionoptions+=tabpages
+set sessionoptions+=winpos
+set sessionoptions+=winsize
+set sessionoptions+=resize
+set sessionoptions+=unix
+set sessionoptions+=slash
 
 set nocindent smartindent     | " use smart indent rather then cindent
 set noshiftround              | " indent/unindent sna=ps to multiple of shiftwidths
@@ -373,10 +382,13 @@ if has("autocmd")
         set wcm=<C-Z>
         map <F4> :emenu <C-Z>
 
-        menu &Chdir.Git\ root
+        menu &Chdir.Git\ root<tab>:Gcd
         \ :Gcd<CR>:pwd<CR>
 
-        menu &Chdir.current\ buffer
+        menu &Chdir.current\ buffer<tab>:cd\ %:h
+        \ :cd %:h<CR>:pwd<CR>
+
+        menu &Chdir.current\ buffer<tab>:lcd\ %:p:h
         \ :lcd %:p:h<CR>:pwd<CR>
 
         menu &Git.&Display\ last\ changes
@@ -477,6 +489,7 @@ endif
 call plug#begin()
 " Colorschemes:
 Plug 'chriskempson/base16-vim'        | " not just one high quality color scheme (all named base16-*)
+Plug 'NLKNguyen/papercolor-theme'     | " the one I like the most
 
 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
@@ -572,7 +585,7 @@ let g:lightline_buffer_minfextlen               = 3
 let g:lightline_buffer_reservelen               = 20
 
 let g:lightline = {
-    \   'colorscheme': 'Tomorrow_Night_Bright',
+    \   'colorscheme': 'Tomorrow_Night_Blue',
     \   'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
     \   'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" },
     \   'active': {
@@ -604,6 +617,12 @@ let g:lightline = {
     \   },
     \ }
 
+function! ExtendLightlineColorTheme()
+  highlight! link LightlineMiddle_normal Normal
+endfunction
+
+autocmd! ColorScheme * call ExtendLightlineColorTheme()
+
 " Autocompleter: =====================================
 if has("python")
   " YouCompleteMe: =====================================================================================================
@@ -726,7 +745,9 @@ function! ExtendColorTheme()
   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! Normal guibg=NONE guifg=black ctermbg=NONE ctermfg=black
+  " highlight! NonText guibg=NONE guifg=black ctermbg=NONE ctermfg=black
+  highlight! EndOfBuffer guifg=white ctermfg=white
 
   highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE
   highlight! Pmenu ctermbg=LightYellow ctermfg=blue
@@ -755,18 +776,21 @@ function! ExtendColorTheme()
 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"
-endif
 
-let base16colorspace=256
-if filereadable(expand("~/.vimrc_background"))
-  source ~/.vimrc_background
-else
-  colorscheme base16-phd
-endif
+colorscheme PaperColor
+set background=light
+" 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"
+" endif
+" 
+" let base16colorspace=256
+" if filereadable(expand("~/.vimrc_background"))
+"   source ~/.vimrc_background
+" else
+"   colorscheme base16-phd
+" endif
 
 
 " ======================================================================================================================