rollback dotfiles and fix dotter

2 files changed, 73 insertions, 72 deletions

diff --git a/.local/share/nvim/site/autoload/statusbar.vim b/.local/share/nvim/site/autoload/statusbar.vim
index 4dc8e31..8b9473c 100644
--- a/.local/share/nvim/site/autoload/statusbar.vim
+++ b/.local/share/nvim/site/autoload/statusbar.vim
@@ -1,27 +1,33 @@
 function TabLabel(n)
 	let buflist = tabpagebuflist(a:n)
 	let winnr = tabpagewinnr(a:n)
-	return bufname(buflist[winnr - 1])
+	return fnamemodify(bufname(buflist[winnr - 1]), ':t')
 endfunction
 
 function! TabLine()
 	let s = ''
 	for i in range(tabpagenr('$'))
+		let s ..= '%#TabLineFill# '
+		" set the tab page number (for mouse clicks)
+		let s ..= '%' .. (i + 1) .. 'T'
 		" select the highlighting
 		if i + 1 == tabpagenr()
-			let s ..= '%#TablineC#%#TabLineSel#'
+			let s ..= '%#TabLineSel# '
 		else
-			let s ..= ' %#TabLine#'
+			let s ..= '%#TabLine# '
 		endif
 
-		" set the tab page number (for mouse clicks)
-		let s ..= '%' .. (i + 1) .. 'T'
+		" the label is made by TabLabel()
+		if TabLabel(i + 1) == ""
+			let s ..= "No Name"
+		else
+			let s ..= TabLabel(i + 1)
+		endif
 
-		" the label is made by MyTabLabel()
-		let s ..= '%{TabLabel(' .. (i + 1) .. ')}'
+		let s ..= " %" .. (i + 1) .. "X"
 
 		if i + 1 == tabpagenr()
-			let s ..= '%#StatusLine#%#TabLine#'
+			let s ..= ' %#StatusLine#%#TabLine#'
 		else
 			let s ..= ' '
 		endif
@@ -30,11 +36,6 @@ function! TabLine()
 	" after the last tab fill with TabLineFill and reset tab page nr
 	let s ..= '%#TabLineFill#%T'
 
-	" right-align the label to close the current tab page
-	if tabpagenr('$') > 1
-		let s ..= '%=%#TablineC#%#TabLineSel#%999X '
-	endif
-
 	return s
 endfunction
 
@@ -52,13 +53,14 @@ function! statusbar#refresh()
 				\ 'R'  : 'R',
 				\ 'Rv' : 'V·Replace',
 				\ 'c'  : 'Command',
+				\ 's'  : 'Snipped'
 				\}
 
 	set statusline=
-	set statusline+=%#StatusLineBlock#\ %{toupper(g:currentmode[mode()])}%#StatusLine#
-	set statusline+=\ %#StatusLine#%#StatusLineBlock#%f%#StatusLine#
+	set statusline+=%#StatusLineBlock#\ %{toupper(g:currentmode[mode()])}\ %#StatusLine#"
+	set statusline+=\ %#StatusLine#%#StatusLineBlock#\ %f\ %#StatusLine#
 	set statusline+=%=
-	set statusline+=%#StatusLine#%#StatusLineBlock#%l/%L\ %p%%\ 
+	set statusline+=%#StatusLine#%#StatusLineBlock#\ %l/%L\ %p%%\ 
 
 	set tabline=%!TabLine()
 endfunction
diff --git a/.local/share/nvim/site/colors/n8.vim b/.local/share/nvim/site/colors/n8.vim
index 816b7ef..bc966fc 100644
--- a/.local/share/nvim/site/colors/n8.vim
+++ b/.local/share/nvim/site/colors/n8.vim
@@ -1,86 +1,85 @@
 " Vim color file
-" Maintainer: Nathan P. Reiner <nathan.p.reiner@gmail.com>
+" Maintainer: Nathan P. Reiner <nathan@nathanreiner.xyz>
 "
 
-syntax reset
 set cursorline
 
 " Default UI
-hi Normal ctermfg=white
-hi NonText ctermfg=darkgrey
-hi LineNr ctermfg=darkgrey
-hi CursorLine cterm=none
-hi CursorLineNr cterm=bold ctermfg=gray
-hi VertSplit cterm=NONE ctermfg=darkgrey ctermbg=black
-hi FloatBorder ctermfg='darkgrey' ctermbg='darkgrey'
+hi Normal                                                        ctermfg=white       guifg=#ebdbb2
+hi NonText                                                       ctermfg=darkgrey
+hi LineNr                                                        ctermfg=darkgrey
+hi CursorLine             cterm=NONE         ctermbg=236
+hi CursorLineNr           cterm=bold         ctermbg=237         ctermfg=gray
+hi VertSplit              cterm=NONE         ctermbg=black       ctermfg=darkgrey
+hi FloatBorder                               ctermbg=NONE        ctermfg=darkgray
+hi NormalFloat                               ctermbg=NONE        ctermfg=white
 
 " Statusline
-hi StatusLine cterm=NONE ctermfg=darkcyan
-hi StatusLineNC cterm=NONE ctermfg=black ctermbg=darkgrey
-hi StatusLineBlock cterm=NONE ctermbg=darkcyan ctermfg=black
+hi StatusLine             cterm=NONE         ctermbg=237         ctermfg=NONE
+hi StatusLineNC           cterm=NONE         ctermbg=none        ctermfg=black
+hi StatusLineBlock        cterm=NONE         ctermbg=magenta     ctermfg=black
+hi SignColumn             cterm=NONE         ctermbg=none        ctermfg=none
 
 " Tab
-hi TabLine     cterm=italic ctermbg=black     ctermfg=darkgrey
-hi TabLineFill cterm=bold   ctermbg=black     ctermfg=darkgrey
-hi TabLineSel  cterm=none   ctermbg=darkcyan ctermfg=black
-hi TabLineC    cterm=none   ctermbg=black     ctermfg=darkcyan
+hi TabLine                cterm=NONE         ctermbg=black       ctermfg=darkgrey
+hi TabLineFill            cterm=NONE         ctermbg=black       ctermfg=darkgrey
+hi TabLineSel             cterm=NONE         ctermbg=magenta     ctermfg=black
+hi TabLineC               cterm=NONE         ctermbg=black       ctermfg=darkcyan
 
 " Highlight
-hi Visual ctermbg=darkgrey ctermfg=black
+hi Visual                                    ctermbg=237
 
 " Text
-hi Title cterm=bold ctermfg=brown ctermbg=black
+hi Title                  cterm=NONE         ctermbg=237         ctermfg=darkgray
 
 " Tooltip
-hi Tooltip ctermbg=lightgray
-hi Menu ctermbg=lightgray
+hi Tooltip                                   ctermbg=lightgray
+hi Menu                                      ctermbg=lightgray
 
 " Menu
-hi Pmenu ctermbg=darkgrey ctermfg=black
-hi PmenuSel cterm=reverse ctermbg=darkgrey ctermfg=black
-hi PmenuSbar ctermbg=lightgray ctermfg=black
-hi PmenuThumb ctermbg=black
+hi Pmenu                  cterm=NONE         ctermbg=237         ctermfg=white
+hi PmenuSel               cterm=bold         ctermbg=darkgrey    ctermfg=white
+hi PmenuSbar                                 ctermbg=236         ctermfg=darkgray
+hi PmenuThumb                                ctermbg=darkgray
 
 " Search
-hi Search ctermbg=darkblue ctermfg=black
+hi Search                                    ctermbg=239         ctermfg=none
 
 " Programming GUI
-hi Type cterm=italic ctermfg=darkcyan
-hi Comment ctermfg=darkgrey
-hi ColorColumn cterm=none ctermbg=black ctermfg=gray
-hi identifier cterm=NONE ctermfg=grey
-hi Error cterm=italic ctermfg=darkred ctermbg=black
-hi Constant cterm=italic ctermfg=darkblue
-hi String cterm=italic ctermfg=cyan
-hi Character cterm=italic ctermfg=yellow
-hi Number cterm=NONE ctermfg=darkblue
-hi Boolean cterm=italic ctermfg=green
-hi PreProc ctermfg=darkgreen
-hi Statement cterm=italic ctermfg=yellow
-hi Todo cterm=italic ctermbg=black ctermfg=darkred
-hi SignColumn ctermbg=black
-"
-" Git
-hi GitGutterAdd cterm=NONE ctermbg=black ctermfg=green
-hi GitGutterDelete cterm=NONE ctermbg=black ctermfg=red
-hi GitGutterChange cterm=NONE ctermbg=black ctermfg=darkyellow
+hi Type                   cterm=italic                           ctermfg=darkcyan
+hi Comment                                                       ctermfg=darkgrey
+hi ColorColumn            cterm=NONE         ctermbg=none        ctermfg=none
+hi identifier             cterm=NONE                             ctermfg=grey
+hi Error                  cterm=italic       ctermbg=black       ctermfg=darkred
+hi Constant               cterm=italic                           ctermfg=darkblue
+hi String                 cterm=italic                           ctermfg=cyan
+hi Character              cterm=italic                           ctermfg=yellow
+hi Number                 cterm=NONE                             ctermfg=darkblue
+hi Boolean                cterm=italic                           ctermfg=green
+hi PreProc                                                       ctermfg=darkgreen
+hi Statement              cterm=italic                           ctermfg=yellow
+hi Todo                   cterm=italic       ctermbg=black       ctermfg=darkred
 
 " Spell
-hi SpellBad cterm=underline ctermbg=black ctermfg=darkred
+hi SpellBad               cterm=underline    ctermbg=black       ctermfg=darkred
 
 " NerdTree
-hi Directory cterm=NONE ctermbg=black ctermfg=darkcyan
+hi Directory              cterm=NONE         ctermbg=black       ctermfg=darkcyan
 
 " Markdown
-hi markdownH1 cterm=bold,italic ctermbg=black ctermfg=brown
-hi markdownH2 cterm=bold,italic ctermbg=black ctermfg=brown
-hi markdownH3 cterm=bold,italic ctermbg=black ctermfg=brown
-hi markdownH4 cterm=bold,italic ctermbg=black ctermfg=brown
-hi markdownH5 cterm=bold,italic ctermbg=black ctermfg=brown
-hi markdownH6 cterm=bold,italic ctermbg=black ctermfg=brown
-hi markdownBlockquote cterm=NONE ctermbg=black ctermfg=darkgrey
-hi markdownCode cterm=italic ctermbg=black ctermfg=white
-hi markdownCodeDelimiter cterm=italic ctermbg=black ctermfg=darkgrey
+hi markdownH1             cterm=bold,italic  ctermbg=black       ctermfg=brown
+hi markdownH2             cterm=bold,italic  ctermbg=black       ctermfg=brown
+hi markdownH3             cterm=bold,italic  ctermbg=black       ctermfg=brown
+hi markdownH4             cterm=bold,italic  ctermbg=black       ctermfg=brown
+hi markdownH5             cterm=bold,italic  ctermbg=black       ctermfg=brown
+hi markdownH6             cterm=bold,italic  ctermbg=black       ctermfg=brown
+hi markdownBlockquote     cterm=NONE         ctermbg=black       ctermfg=darkgrey
+hi markdownCode           cterm=italic       ctermbg=black       ctermfg=white
+hi markdownCodeDelimiter  cterm=italic       ctermbg=black       ctermfg=darkgrey
 
 " Folds
-hi Folded ctermbg=gray
+hi Folded                                    ctermbg=black       ctermfg=gray
+
+" Completion
+hi CmpItemKind            cterm=italic       ctermbg=NONE        ctermfg=magenta
+hi CmpSel                                    ctermbg=magenta     ctermfg=black