diff --git a/.config/nvim/colors/polyjuice.vim b/.config/nvim/colors/polyjuice.vim index 39fdf67..bc046a9 100644 --- a/.config/nvim/colors/polyjuice.vim +++ b/.config/nvim/colors/polyjuice.vim @@ -4,7 +4,7 @@ " Maintainer: David JULIEN " Website: https://github.com/vim/vim/blob/master/src/syntax.c " License: Vim License (see `:help license`) -" Last Updated: Wed 06 May 2020 02:37:59 AM CEST +" Last Updated: Thu 07 May 2020 12:50:21 PM CEST " Generated by Colortemplate v2.0.0 @@ -45,10 +45,11 @@ hi! link String Constant hi! link Structure Type hi! link Tag Special hi! link Typedef Type +hi! link NvimInternalError ErrorMsg if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#1d2021', '#b73935', '#5a8471', '#f7a583', - \ '#458588', '#b16286', '#7cafa3', '#a89984', '#7c6f64', '#ea6962', + \ '#458588', '#b16286', '#7cafa3', '#7c6f64', '#a89984', '#ea6962', \ '#89b594', '#ffeca3', '#7daea3', '#d3869b', '#ace5d7', '#ebdbb2'] hi Normal guifg=#ebdbb2 guibg=NONE guisp=NONE gui=NONE cterm=NONE hi Terminal guifg=#ebdbb2 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE @@ -60,40 +61,40 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi SpellRare guifg=#f7a583 guibg=NONE guisp=NONE gui=NONE cterm=NONE hi StatusLineTerm guifg=#1d2021 guibg=#89b594 guisp=NONE gui=bold cterm=bold hi StatusLineNC guifg=#1d2021 guibg=#89b594 guisp=NONE gui=NONE cterm=NONE - hi TabLine guifg=#ebdbb2 guibg=#a89984 guisp=NONE gui=underline cterm=underline + hi TabLine guifg=#ebdbb2 guibg=#7c6f64 guisp=NONE gui=underline cterm=underline hi Todo guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=bold cterm=bold hi ColorColumn guifg=NONE guibg=#b73935 guisp=NONE gui=NONE cterm=NONE - hi Conceal guifg=#7c6f64 guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi Conceal guifg=#a89984 guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE hi Cursor guifg=#1d2021 guibg=#ebdbb2 guisp=NONE gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#a89984 guisp=NONE gui=NONE cterm=NONE - hi CursorColumn guifg=NONE guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE + hi CursorColumn guifg=NONE guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE hi CursorLineNr guifg=#f7a583 guibg=NONE guisp=NONE gui=bold cterm=bold - hi DiffAdd guifg=NONE guibg=#5a8471 guisp=NONE gui=NONE cterm=NONE - hi DiffChange guifg=NONE guibg=#f7a583 guisp=NONE gui=NONE cterm=NONE - hi DiffDelete guifg=NONE guibg=#b73935 guisp=NONE gui=bold cterm=bold - hi DiffText guifg=NONE guibg=#ea6962 guisp=NONE gui=bold cterm=bold + hi DiffAdd guifg=#1d2021 guibg=#5a8471 guisp=NONE gui=NONE cterm=NONE + hi DiffChange guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=NONE cterm=NONE + hi DiffDelete guifg=#1d2021 guibg=#b73935 guisp=NONE gui=bold cterm=bold + hi DiffText guifg=#1d2021 guibg=#ea6962 guisp=NONE gui=bold cterm=bold hi Directory guifg=#d3869b guibg=NONE guisp=NONE gui=NONE cterm=NONE hi ErrorMsg guifg=#ffeca3 guibg=#b73935 guisp=NONE gui=bold cterm=bold - hi FoldColumn guifg=#f7a583 guibg=#a89984 guisp=NONE gui=NONE cterm=NONE - hi Folded guifg=#f7a583 guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#f7a583 guibg=#458588 guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=#f7a583 guibg=#458588 guisp=NONE gui=NONE cterm=NONE hi IncSearch guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse - hi LineNr guifg=#a89984 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi LineNr guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE cterm=NONE hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg guifg=#89b594 guibg=NONE guisp=NONE gui=bold cterm=bold hi NonText guifg=#7daea3 guibg=NONE guisp=NONE gui=bold cterm=bold - hi PmenuSbar guifg=NONE guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE - hi PmenuThumb guifg=NONE guibg=#ebdbb2 guisp=NONE gui=NONE cterm=NONE + hi PmenuSbar guifg=#1d2021 guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi PmenuThumb guifg=#ebdbb2 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE hi Question guifg=#89b594 guibg=NONE guisp=NONE gui=bold cterm=bold hi Search guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=NONE cterm=NONE hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi SpecialKey guifg=#ace5d7 guibg=NONE guisp=NONE gui=NONE cterm=NONE - hi StatusLine guifg=#ebdbb2 guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi StatusLine guifg=#ebdbb2 guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE hi StatusLineNC guifg=#ebdbb2 guibg=#1d2021 guisp=NONE gui=reverse cterm=reverse hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold hi Title guifg=#f7a583 guibg=NONE guisp=NONE gui=bold cterm=bold - hi VertSplit guifg=#ebdbb2 guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi VertSplit guifg=#ebdbb2 guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE hi Visual guifg=#ffeca3 guibg=#b16286 guisp=NONE gui=NONE cterm=NONE hi VisualNOS guifg=NONE guibg=NONE guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline hi WarningMsg guifg=#ea6962 guibg=NONE guisp=NONE gui=NONE cterm=NONE @@ -109,8 +110,8 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi Type guifg=#ffeca3 guibg=NONE guisp=NONE gui=bold cterm=bold hi Underlined guifg=#458588 guibg=NONE guisp=NONE gui=underline cterm=underline hi! link lCursor Cursor - hi ToolbarLine guifg=NONE guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE - hi ToolbarButton guifg=#1d2021 guibg=#7c6f64 guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=#a89984 guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#1d2021 guibg=#a89984 guisp=NONE gui=bold cterm=bold unlet s:t_Co finish endif @@ -126,40 +127,40 @@ if s:t_Co >= 256 hi SpellRare ctermfg=216 ctermbg=NONE cterm=NONE hi StatusLineTerm ctermbg=71 cterm=bold hi StatusLineNC ctermbg=71 cterm=NONE - hi TabLine ctermfg=229 ctermbg=239 cterm=underline + hi TabLine ctermfg=229 ctermbg=243 cterm=underline hi Todo ctermbg=216 cterm=bold hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE - hi Conceal ctermfg=243 ctermbg=239 cterm=NONE + hi Conceal ctermfg=239 ctermbg=243 cterm=NONE hi Cursor ctermbg=229 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=239 cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=239 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=243 cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=243 cterm=NONE hi CursorLineNr ctermfg=216 ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=NONE ctermbg=2 cterm=NONE - hi DiffChange ctermfg=NONE ctermbg=216 cterm=NONE - hi DiffDelete ctermfg=NONE ctermbg=160 cterm=NONE - hi DiffText ctermfg=NONE ctermbg=203 cterm=bold + hi DiffAdd ctermbg=2 cterm=NONE + hi DiffChange ctermbg=216 cterm=NONE + hi DiffDelete ctermbg=160 cterm=NONE + hi DiffText ctermbg=203 cterm=bold hi Directory ctermfg=181 ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=230 ctermbg=160 cterm=bold - hi FoldColumn ctermfg=216 ctermbg=239 cterm=NONE - hi Folded ctermfg=216 ctermbg=239 cterm=NONE + hi FoldColumn ctermfg=216 ctermbg=24 cterm=NONE + hi Folded ctermfg=216 ctermbg=24 cterm=NONE hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse - hi LineNr ctermfg=239 ctermbg=NONE cterm=NONE + hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=71 ctermbg=NONE cterm=NONE hi NonText ctermfg=24 ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=243 cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=229 cterm=NONE + hi PmenuSbar ctermbg=239 cterm=NONE + hi PmenuThumb ctermfg=229 cterm=NONE hi Question ctermfg=71 ctermbg=NONE cterm=NONE hi Search ctermbg=216 cterm=NONE hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=81 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=229 ctermbg=239 cterm=NONE + hi StatusLine ctermfg=229 ctermbg=243 cterm=NONE hi StatusLineNC ctermfg=229 cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold hi Title ctermfg=216 ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=229 ctermbg=239 cterm=NONE + hi VertSplit ctermfg=229 ctermbg=243 cterm=NONE hi Visual ctermfg=230 ctermbg=138 cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE @@ -175,8 +176,8 @@ if s:t_Co >= 256 hi Type ctermfg=230 ctermbg=NONE cterm=NONE hi Underlined ctermfg=24 ctermbg=NONE cterm=underline hi! link lCursor Cursor - hi ToolbarLine ctermfg=NONE ctermbg=243 cterm=NONE - hi ToolbarButton ctermbg=243 cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=239 cterm=NONE + hi ToolbarButton ctermbg=239 cterm=bold unlet s:t_Co finish endif @@ -192,40 +193,40 @@ if s:t_Co >= 8 hi SpellRare ctermfg=LightRed ctermbg=NONE cterm=NONE hi StatusLineTerm ctermfg=Black ctermbg=Green cterm=bold hi StatusLineNC ctermfg=Black ctermbg=Green cterm=NONE - hi TabLine ctermfg=LightYellow ctermbg=DarkGrey cterm=underline + hi TabLine ctermfg=LightYellow ctermbg=Grey cterm=underline hi Todo ctermfg=Black ctermbg=LightRed cterm=bold hi ColorColumn ctermfg=NONE ctermbg=DarkRed cterm=NONE - hi Conceal ctermfg=Grey ctermbg=DarkGrey cterm=NONE + hi Conceal ctermfg=DarkGrey ctermbg=Grey cterm=NONE hi Cursor ctermfg=Black ctermbg=LightYellow cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=DarkGrey cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=DarkGrey cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=Grey cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=Grey cterm=NONE hi CursorLineNr ctermfg=LightRed ctermbg=NONE cterm=NONE - hi DiffAdd ctermfg=NONE ctermbg=DarkGreen cterm=NONE - hi DiffChange ctermfg=NONE ctermbg=LightRed cterm=NONE - hi DiffDelete ctermfg=NONE ctermbg=DarkRed cterm=NONE - hi DiffText ctermfg=NONE ctermbg=Red cterm=bold + hi DiffAdd ctermfg=Black ctermbg=DarkGreen cterm=NONE + hi DiffChange ctermfg=Black ctermbg=LightRed cterm=NONE + hi DiffDelete ctermfg=Black ctermbg=DarkRed cterm=NONE + hi DiffText ctermfg=Black ctermbg=Red cterm=bold hi Directory ctermfg=Magenta ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=White ctermbg=DarkRed cterm=bold - hi FoldColumn ctermfg=LightRed ctermbg=DarkGrey cterm=NONE - hi Folded ctermfg=LightRed ctermbg=DarkGrey cterm=NONE + hi FoldColumn ctermfg=LightRed ctermbg=DarkBlue cterm=NONE + hi Folded ctermfg=LightRed ctermbg=DarkBlue cterm=NONE hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse - hi LineNr ctermfg=DarkGrey ctermbg=NONE cterm=NONE + hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold hi MoreMsg ctermfg=Green ctermbg=NONE cterm=NONE hi NonText ctermfg=DarkCyan ctermbg=NONE cterm=NONE - hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE - hi PmenuThumb ctermfg=NONE ctermbg=LightYellow cterm=NONE + hi PmenuSbar ctermfg=Black ctermbg=DarkGrey cterm=NONE + hi PmenuThumb ctermfg=LightYellow ctermbg=Black cterm=NONE hi Question ctermfg=Green ctermbg=NONE cterm=NONE hi Search ctermfg=Black ctermbg=LightRed cterm=NONE hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=LightBlue ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=LightYellow ctermbg=DarkGrey cterm=NONE + hi StatusLine ctermfg=LightYellow ctermbg=Grey cterm=NONE hi StatusLineNC ctermfg=LightYellow ctermbg=Black cterm=reverse hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold hi Title ctermfg=LightRed ctermbg=NONE cterm=NONE - hi VertSplit ctermfg=LightYellow ctermbg=DarkGrey cterm=NONE + hi VertSplit ctermfg=LightYellow ctermbg=Grey cterm=NONE hi Visual ctermfg=White ctermbg=DarkMagenta cterm=NONE hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE @@ -241,8 +242,8 @@ if s:t_Co >= 8 hi Type ctermfg=White ctermbg=NONE cterm=NONE hi Underlined ctermfg=DarkBlue ctermbg=NONE cterm=underline hi! link lCursor Cursor - hi ToolbarLine ctermfg=NONE ctermbg=Grey cterm=NONE - hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=DarkGrey cterm=NONE + hi ToolbarButton ctermfg=Black ctermbg=DarkGrey cterm=bold unlet s:t_Co finish endif @@ -254,8 +255,8 @@ endif " Color: darkblue #458588 24 DarkBlue " Color: darkmagenta #b16286 138 DarkMagenta " Color: darkcyan #7cafa3 30 DarkCyan -" Color: darkgrey #a89984 239 DarkGrey -" Color: grey #7c6f64 243 Grey +" Color: grey #a89984 239 DarkGrey +" Color: darkgrey #7c6f64 243 Grey " Color: red #ea6962 203 Red " Color: green #89b594 71 Green " Color: yellow #ffeca3 230 White diff --git a/.config/nvim/polyjuice.colortemplate b/.config/nvim/polyjuice.colortemplate index a405c3a..2039a37 100644 --- a/.config/nvim/polyjuice.colortemplate +++ b/.config/nvim/polyjuice.colortemplate @@ -18,8 +18,8 @@ Color: orange #f7a583 216 LightRed Color: darkblue #458588 24 DarkBlue Color: darkmagenta #b16286 138 DarkMagenta Color: darkcyan #7cafa3 30 DarkCyan -Color: darkgrey #a89984 239 DarkGrey -Color: grey #7c6f64 243 Grey +Color: grey #a89984 239 DarkGrey +Color: darkgrey #7c6f64 243 Grey Color: red #ea6962 203 Red Color: green #89b594 71 Green Color: yellow #ffeca3 230 White @@ -64,6 +64,8 @@ Tag -> Special Typedef -> Type # }}} +NvimInternalError -> ErrorMsg + Background: dark # Default highlight groups for dark variant {{{ @@ -76,42 +78,42 @@ Variant: gui 256 8 Normal white none Terminal white black Pmenu white black -PmenuSel black green bold +PmenuSel black green bold SpellBad red none underline SpellCap blue none -SpellLocal cyan none +SpellLocal cyan none SpellRare orange none -StatusLineTerm black green bold +StatusLineTerm black green bold StatusLineNC black green TabLine white darkgrey underline Todo black orange bold ColorColumn none darkred -Conceal grey darkgrey +Conceal grey darkgrey # NOTE: Vim's default does not define Cursor/lCursor in the terminal Cursor black white CursorLine none darkgrey CursorColumn none darkgrey CursorLineNr orange none g=bold -DiffAdd none darkgreen -DiffChange none orange -DiffDelete none darkred g=bold -DiffText none red bold +DiffAdd black darkgreen +DiffChange black orange +DiffDelete black darkred g=bold +DiffText black red bold Directory magenta none ErrorMsg yellow darkred bold -FoldColumn orange darkgrey -Folded orange darkgrey +FoldColumn orange darkblue +Folded orange darkblue IncSearch none none reverse LineNr darkgrey none MatchParen none none reverse ModeMsg none none bold -MoreMsg green none g=bold +MoreMsg green none g=bold NonText blue none g=bold -PmenuSbar none grey -PmenuThumb none white -Question green none g=bold +PmenuSbar black grey +PmenuThumb white black +Question green none g=bold Search black orange SignColumn none none -SpecialKey cyan none +SpecialKey cyan none StatusLine white darkgrey StatusLineNC white black reverse TabLineFill none none @@ -121,14 +123,14 @@ VertSplit white darkgrey Visual yellow darkmagenta VisualNOS none none underline,bold WarningMsg red none -WildMenu black green bold +WildMenu black green bold # Other conventional group names (see `:help group-name`) -Comment grey none +Comment darkgrey none Constant magenta none Error white red bold Identifier blue none bold Ignore black none -PreProc green none +PreProc green none Special orange none Statement orange none g=bold Type yellow none g=bold @@ -137,5 +139,5 @@ Underlined darkblue none underline lCursor -> Cursor # See `:help window-toolbar` ToolbarLine none grey -ToolbarButton black grey bold +ToolbarButton black grey bold # }}}