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 = '#E5A7C4'
let g:terminal_color_14 = '#7DD093'
let g:terminal_color_15 = '#B2A790'
highlight Normal guifg=#E7DCC4 guibg=#2C343A 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=#E7DCC4 guibg=#313A41 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=#5D6D78 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link EndOfBuffer NonText
highlight! link Whitespace NonText
highlight Normal guifg=#E7DCC4 guibg=#2C343A guisp=NONE gui=NONE cterm=NONE
highlight NormalFloat guifg=NONE guibg=#3B464E guisp=NONE gui=NONE cterm=NONE
highlight Number guifg=#E7DCC4 guibg=NONE guisp=NONE gui=italic cterm=italic
highlight! link Boolean Number
@@ -163,7 +163,8 @@ if &background ==# 'dark'
highlight NvimTreeRootFolder guifg=#7FBCB4 guibg=NONE guisp=NONE gui=bold cterm=bold
highlight NvimTreeSpecialFile guifg=#D69AB7 guibg=NONE guisp=NONE gui=underline cterm=underline
highlight NvimTreeSymlink guifg=#7FBCB4 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=#3B464E guisp=NONE gui=NONE cterm=NONE
highlight PmenuSbar guifg=NONE guibg=#606F7B guisp=NONE gui=NONE cterm=NONE
highlight PmenuSel guifg=NONE guibg=#4E5B65 guisp=NONE gui=NONE cterm=NONE
@@ -211,6 +212,7 @@ if &background ==# 'dark'
highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline
highlight! link TSUnderline Underlined
highlight VertSplit guifg=#667783 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link WinSeparator VertSplit
highlight Visual guifg=NONE guibg=#615B51 guisp=NONE gui=NONE cterm=NONE
highlight WarningMsg guifg=#DDBD7F guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link DiagnosticWarn WarningMsg
@@ -278,7 +280,6 @@ else
let g:terminal_color_13 = '#CA43A3'
let g:terminal_color_14 = '#258C67'
let g:terminal_color_15 = '#6E7F88'
highlight Normal guifg=#4F5B62 guibg=#FAF3E1 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=#4F5B62 guibg=#F6EBC8 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=#C0B079 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link EndOfBuffer NonText
highlight! link Whitespace NonText
highlight Normal guifg=#4F5B62 guibg=#FAF3E1 guisp=NONE gui=NONE cterm=NONE
highlight NormalFloat guifg=NONE guibg=#F0DC99 guisp=NONE gui=NONE cterm=NONE
highlight Number guifg=#4F5B62 guibg=NONE guisp=NONE gui=italic cterm=italic
highlight! link Boolean Number
@@ -411,7 +413,8 @@ else
highlight NvimTreeRootFolder guifg=#3A94C4 guibg=NONE guisp=NONE gui=bold cterm=bold
highlight NvimTreeSpecialFile guifg=#DF69BA guibg=NONE guisp=NONE gui=underline cterm=underline
highlight NvimTreeSymlink guifg=#3A94C4 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=#E9D795 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSbar guifg=NONE guibg=#B7A874 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSel guifg=NONE guibg=#CFBE83 guisp=NONE gui=NONE cterm=NONE
@@ -459,6 +462,7 @@ else
highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline
highlight! link TSUnderline Underlined
highlight VertSplit guifg=#A99B6A guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link WinSeparator VertSplit
highlight Visual guifg=NONE guibg=#D3DFE6 guisp=NONE gui=NONE cterm=NONE
highlight WarningMsg guifg=#DEA000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link DiagnosticWarn WarningMsg