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 = '#CEB3EF'
let g:terminal_color_14 = '#94DAE6'
let g:terminal_color_15 = '#BF9B99'
highlight Normal guifg=#E1D4D4 guibg=#1A1825 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=#E1D4D4 guibg=#222030 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=#565172 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link EndOfBuffer NonText
highlight! link Whitespace NonText
highlight Normal guifg=#E1D4D4 guibg=#1A1825 guisp=NONE gui=NONE cterm=NONE
highlight NormalFloat guifg=NONE guibg=#2D2A3D guisp=NONE gui=NONE cterm=NONE
highlight Number guifg=#E1D4D4 guibg=NONE guisp=NONE gui=italic cterm=italic
highlight! link Boolean Number
@@ -163,7 +163,8 @@ if &background ==# 'dark'
highlight NvimTreeRootFolder guifg=#9CCFD8 guibg=NONE guisp=NONE gui=bold cterm=bold
highlight NvimTreeSpecialFile guifg=#C4A7E7 guibg=NONE guisp=NONE gui=underline cterm=underline
highlight NvimTreeSymlink guifg=#9CCFD8 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=#2D2A3D guisp=NONE gui=NONE cterm=NONE
highlight PmenuSbar guifg=NONE guibg=#5A5578 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSel guifg=NONE guibg=#45415D 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=#625D7F guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link WinSeparator VertSplit
highlight Visual guifg=NONE guibg=#523A39 guisp=NONE gui=NONE cterm=NONE
highlight WarningMsg guifg=#F6C074 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link DiagnosticWarn WarningMsg
@@ -278,7 +280,6 @@ else
let g:terminal_color_13 = '#855AAC'
let g:terminal_color_14 = '#407D88'
let g:terminal_color_15 = '#A4635F'
highlight Normal guifg=#724341 guibg=#FBF6F0 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=#724341 guibg=#F7ECE0 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=#CEAF7E guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link EndOfBuffer NonText
highlight! link Whitespace NonText
highlight Normal guifg=#724341 guibg=#FBF6F0 guisp=NONE gui=NONE cterm=NONE
highlight NormalFloat guifg=NONE guibg=#F1DDC3 guisp=NONE gui=NONE cterm=NONE
highlight Number guifg=#724341 guibg=NONE guisp=NONE gui=italic cterm=italic
highlight! link Boolean Number
@@ -411,7 +413,8 @@ else
highlight NvimTreeRootFolder guifg=#5795A0 guibg=NONE guisp=NONE gui=bold cterm=bold
highlight NvimTreeSpecialFile guifg=#917BA9 guibg=NONE guisp=NONE gui=underline cterm=underline
highlight NvimTreeSymlink guifg=#5795A0 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=#EED7B7 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSbar guifg=NONE guibg=#C5A778 guisp=NONE gui=NONE cterm=NONE
highlight PmenuSel guifg=NONE guibg=#DEBC88 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=#B69A6E guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link WinSeparator VertSplit
highlight Visual guifg=NONE guibg=#EADDDC guisp=NONE gui=NONE cterm=NONE
highlight WarningMsg guifg=#EC9D33 guibg=NONE guisp=NONE gui=NONE cterm=NONE
highlight! link DiagnosticWarn WarningMsg