From 49f70af2b321f89b2998d12bf78f02c4b3e08695 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen@syndamia.com>
Date: Sat, 25 Feb 2023 12:27:20 +0200
Subject: [.vim] Solved issues with session restore and highlight groups and
 nerdtree

---
 .vim/miniplugins/statusline.vim |  8 ++++----
 .vim/miniplugins/tabline.vim    | 27 ++++++++++++++++-----------
 .vim/startup/pluginsettings.vim |  3 +++
 3 files changed, 23 insertions(+), 15 deletions(-)

(limited to '.vim')

diff --git a/.vim/miniplugins/statusline.vim b/.vim/miniplugins/statusline.vim
index 8cc14cc..980a65b 100644
--- a/.vim/miniplugins/statusline.vim
+++ b/.vim/miniplugins/statusline.vim
@@ -25,8 +25,8 @@ let g:inactivesl = ''
 
 	let g:modestring = ''
 
-	hi SLMode  ctermfg=1 ctermbg=0
-	hi SLModeC ctermfg=1 ctermbg=0
+	autocmd ColorScheme * hi SLMode  ctermfg=1 ctermbg=0
+	autocmd ColorScheme * hi SLModeC ctermfg=1 ctermbg=0
 
 	function! SLModeSetter()
 		let cm = mode()
@@ -85,8 +85,8 @@ let g:inactivesl = ''
 " }}}
 
 " Line and column count {{{
-	hi SLRowCol  ctermfg=238 ctermbg=244
-	hi SLRowColC ctermfg=244 ctermbg=239
+	autocmd ColorScheme * hi SLRowCol  ctermfg=238 ctermbg=244
+	autocmd ColorScheme * hi SLRowColC ctermfg=244 ctermbg=239
 
 	let g:_linecol = '%#SLRowColC#%{leftcap}%#SLRowCol#%l:%c%#SLRowColC#%{rightcap}'
 	let g:activesl   ..= g:_linecol
diff --git a/.vim/miniplugins/tabline.vim b/.vim/miniplugins/tabline.vim
index 63d927a..9fedbb3 100644
--- a/.vim/miniplugins/tabline.vim
+++ b/.vim/miniplugins/tabline.vim
@@ -27,17 +27,22 @@ set tabline=%!TablineGenerator()
 " }}}
 
 " Colors {{{
-	hi TLTab    ctermfg=252 ctermbg=242
-	hi TLTabSel ctermfg=252 ctermbg=235
-	hi TLRest   ctermfg=248 ctermbg=238
-
-	let s:hi_tltab    = hlget('TLTab')[0]
-	let s:hi_tltabsel = hlget('TLTabSel')[0]
-	let s:hi_tlrest   = hlget('TLRest')[0]
-	call hlset([#{name: 'TLTabSelLC',  ctermfg: s:hi_tltab['ctermbg'],    ctermbg: s:hi_tltabsel['ctermbg'] },
-	\           #{name: 'TLTabSelRC',  ctermfg: s:hi_tltabsel['ctermbg'], ctermbg: s:hi_tltab['ctermbg'] },
-	\           #{name: 'TLTabSelRCF', ctermfg: s:hi_tltabsel['ctermbg'], ctermbg: s:hi_tlrest['ctermbg'] },
-	\           #{name: 'TLTabRCF',    ctermfg: s:hi_tltab['ctermbg'],    ctermbg: s:hi_tlrest['ctermbg'] }])
+	autocmd ColorScheme * call CreateHighlightGroups()
+
+	" Colorscheme clears highlights https://vi.stackexchange.com/a/3356
+	function! CreateHighlightGroups()
+		hi TLTab    ctermfg=252 ctermbg=242
+		hi TLTabSel ctermfg=252 ctermbg=235
+		hi TLRest   ctermfg=248 ctermbg=238
+
+		let s:hi_tltab    = hlget('TLTab')[0]
+		let s:hi_tltabsel = hlget('TLTabSel')[0]
+		let s:hi_tlrest   = hlget('TLRest')[0]
+		call hlset([#{name: 'TLTabSelLC',  ctermfg: s:hi_tltab['ctermbg'],    ctermbg: s:hi_tltabsel['ctermbg'] },
+		\           #{name: 'TLTabSelRC',  ctermfg: s:hi_tltabsel['ctermbg'], ctermbg: s:hi_tltab['ctermbg'] },
+		\           #{name: 'TLTabSelRCF', ctermfg: s:hi_tltabsel['ctermbg'], ctermbg: s:hi_tlrest['ctermbg'] },
+		\           #{name: 'TLTabRCF',    ctermfg: s:hi_tltab['ctermbg'],    ctermbg: s:hi_tlrest['ctermbg'] }])
+	endfunction
 " }}}
 
 function! TablineGenerator()
diff --git a/.vim/startup/pluginsettings.vim b/.vim/startup/pluginsettings.vim
index 3b8e87e..1088950 100644
--- a/.vim/startup/pluginsettings.vim
+++ b/.vim/startup/pluginsettings.vim
@@ -12,6 +12,9 @@
 	let NERDTreeShowHidden     = 1
 	let NERDTreeWinPos         = "right"
 	let NERDTreeIgnore         = ['\.swp$', '\~$'] " Ignore file, ending with .swp and ~
+
+	" Do not save blank screens, solves https://github.com/preservim/nerdtree/issues/745
+	set sessionoptions-=blank
 " }}}
 
 " Undotree {{{
-- 
cgit v1.2.3