don't rely on fg = "bg" when bg is transparent

- Support nvim-0.7 WinSeparator
- nnn.nvim and nvim-tree.lua changes

close #87
close #88

Co-authored-by: Qingyao Sun <sunqingyao19970825@icloud.com>
This commit is contained in:
Michael Chris Lopez
2022-06-25 10:32:50 +08:00
parent fc293f6a38
commit dc48976135
14 changed files with 104 additions and 62 deletions

View File

@@ -30,7 +30,6 @@ if &background ==# 'dark'
let g:terminal_color_13 = '#C6ACFA'
let g:terminal_color_14 = '#74DBCB'
let g:terminal_color_15 = '#7E98EB'
highlight Normal guifg=#C0CAF5 guibg=#1A1B26 guisp=NONE gui=NONE cterm=NONE
highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold
highlight! link LightspeedUnlabeledMatch Bold
highlight! link TSStrong Bold
@@ -146,10 +145,11 @@ if &background ==# 'dark'
highlight! link Question MoreMsg
highlight NeogitHunkHeaderHighlight guifg=#C0CAF5 guibg=#222330 guisp=NONE gui=bold cterm=bold
highlight! link NnnNormalNC NnnNormal
highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link NnnVertSplit NnnWinSeparator
highlight NonText guifg=#535570 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link EndOfBuffer NonText
highlight! link Whitespace NonText
highlight Normal guifg=#C0CAF5 guibg=#1A1B26 guisp=NONE gui=NONE cterm=NONE
highlight NormalFloat guifg=NONE guibg=#2C2D3D guisp=NONE gui=NONE cterm=NONE
highlight Number guifg=#2BC4DE guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link Boolean Number
@@ -162,7 +162,8 @@ if &background ==# 'dark'
highlight NvimTreeRootFolder guifg=#7BA2F7 guibg=NONE guisp=NONE gui=bold cterm=bold
highlight NvimTreeSpecialFile guifg=#BB9BF7 guibg=NONE guisp=NONE gui=underline cterm=underline
highlight NvimTreeSymlink guifg=#7BA2F7 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight NvimTreeWinSeparator guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link NnnWinSeparator NvimTreeWinSeparator
highlight Pmenu guifg=NONE guibg=#2C2D3D guisp=NONE gui=NONE cterm=NONE
highlight PmenuSbar guifg=NONE guibg=#585A76 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSel guifg=NONE guibg=#43455B guisp=NONE gui=NONE cterm=NONE
@@ -212,6 +213,7 @@ if &background ==# 'dark'
highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline
highlight! link TSUnderline Underlined
highlight VertSplit guifg=#5F617E guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link WinSeparator VertSplit
highlight Visual guifg=NONE guibg=#2C4075 guisp=NONE gui=NONE cterm=NONE
highlight WarningMsg guifg=#E1B068 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link DiagnosticWarn WarningMsg
@@ -278,7 +280,6 @@ else
let g:terminal_color_13 = '#503875'
let g:terminal_color_14 = '#34645D'
let g:terminal_color_15 = '#56618D'
highlight Normal guifg=#333A57 guibg=#D6D7DC guisp=NONE gui=NONE cterm=NONE
highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold
highlight! link LightspeedUnlabeledMatch Bold
highlight! link TSStrong Bold
@@ -394,10 +395,11 @@ else
highlight! link Question MoreMsg
highlight NeogitHunkHeaderHighlight guifg=#333A57 guibg=#CDCED4 guisp=NONE gui=bold cterm=bold
highlight! link NnnNormalNC NnnNormal
highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link NnnVertSplit NnnWinSeparator
highlight NonText guifg=#9B9DA9 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link EndOfBuffer NonText
highlight! link Whitespace NonText
highlight Normal guifg=#333A57 guibg=#D6D7DC guisp=NONE gui=NONE cterm=NONE
highlight NormalFloat guifg=NONE guibg=#C2C3CB guisp=NONE gui=NONE cterm=NONE
highlight Number guifg=#176775 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link Boolean Number
@@ -410,7 +412,8 @@ else
highlight NvimTreeRootFolder guifg=#34548C guibg=NONE guisp=NONE gui=bold cterm=bold
highlight NvimTreeSpecialFile guifg=#5A4A79 guibg=NONE guisp=NONE gui=underline cterm=underline
highlight NvimTreeSymlink guifg=#34548C guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight NvimTreeWinSeparator guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link NnnWinSeparator NvimTreeWinSeparator
highlight Pmenu guifg=NONE guibg=#BCBEC6 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSbar guifg=NONE guibg=#9395A2 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSel guifg=NONE guibg=#A6A8B3 guisp=NONE gui=NONE cterm=NONE
@@ -460,6 +463,7 @@ else
highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline
highlight! link TSUnderline Underlined
highlight VertSplit guifg=#888B99 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link WinSeparator VertSplit
highlight Visual guifg=NONE guibg=#BBC0D8 guisp=NONE gui=NONE cterm=NONE
highlight WarningMsg guifg=#8F5E14 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link DiagnosticWarn WarningMsg