This commit is contained in:
Ray Elliott 2020-07-28 23:25:40 +01:00
parent 88a47af52d
commit bdc4688493
2 changed files with 29 additions and 49 deletions

View File

@ -51,35 +51,28 @@
ui_fg = ["#828282", 243, "gray"] ui_fg = ["#828282", 243, "gray"]
ui_fg_strong = ["#444444", 255, "white"] ui_fg_strong = ["#444444", 255, "white"]
ui_cursor_bg = ["#eee4e4", 255, "white"]
ui_cursor_fg = ["#131313", 0, "black"]
ui_search = ["#b7c3cd", 17, "darkblue"] ui_search = ["#b7c3cd", 17, "darkblue"]
ui_incsearch = ["#5a727c", 17, "darkblue"] ui_incsearch = ["#5a727c", 17, "darkblue"]
ui_visual_bg = ["#ced8e0", 17, "darkblue"] ui_visual_bg = ["#ced8e0", 17, "darkblue"]
ui_visualnos_bg = ["#e0d4ce", 52, "darkred"] ui_visualnos_bg = ["#e0d4ce", 52, "darkred"]
ui_sign_add = ["#496349", 34, "green"]
ui_sign_change = ["#596171", 19, "blue"]
ui_sign_delete = ["#725454", 124, "red"]
ui_sign_changedelete = ["#5c4a5a", 126, "magenta"]
ui_statusbar_mod = ["#655757", 124, "red"]
ui_statusbar_mod_active = ["#916c6c", 124, "red"]
ui_statusbar_input = ["#ced8e0", 17, "darkblue"]
ui_fg_error = ["#c74444", 196, "red"] ui_fg_error = ["#c74444", 196, "red"]
ui_fg_warning = ["#a67038", 166, "yellow"] ui_fg_warning = ["#a67038", 166, "yellow"]
ui_fg_question = ["#797532", 247, "darkgray"] ui_fg_question = ["#797532", 247, "darkgray"]
diff_delete_bg = ["#ece0e0", 52, "darkred"]
diff_add_bg = ["#e0ece0", 22, "darkgreen"]
diff_change_bg = ["#e0e0ec", 17, "darkblue"]
diff_change_fg = ["#656a7c", 21, "white"]
# Step 3: highlights # Step 3: highlights
highlights = [ highlights = [
[ "DiffAdd", ["#e0ece0", 22, "darkgreen"], "NONE", "NONE" ],
[ "DiffChange", ["#e0e0ec", 17, "darkblue"], "NONE", "NONE" ],
[ "DiffDelete", ["#ece0e0", 52, "darkred"], "NONE", "NONE" ],
[ "DiffText", ["#e0e0ec", 17, "darkblue"], ["#656a7c", 21, "white"], "NONE" ],
[ "GitGutterDelete", "NONE", ["#725454", 124, "red"], "bold"],
[ "GitGutterChange", "NONE", ["#596171", 19, "blue"], "bold"],
[ "GitGutterAdd", "NONE", ["#496349", 34, "green"], "bold"],
[ "GitGutterChangeDelete", "NONE", ["#5c4a5a", 126, "magenta"], "bold"],
[ "Normal", bg, fg, "NONE" ], [ "Normal", bg, fg, "NONE" ],
[ "Special", "NONE", color_primary_strong, "bold" ], [ "Special", "NONE", color_primary_strong, "bold" ],
@ -152,11 +145,6 @@
[ "SpecialKey", "NONE", color_primary_strong, "NONE" ], [ "SpecialKey", "NONE", color_primary_strong, "NONE" ],
[ "DiffAdd", diff_add_bg, "NONE", "NONE" ],
[ "DiffChange", diff_change_bg, "NONE", "NONE" ],
[ "DiffDelete", diff_delete_bg, "NONE", "NONE" ],
[ "DiffText", diff_change_bg, diff_change_fg, "NONE" ],
[ "IncSearch", ui_incsearch, bg, "NONE" ], [ "IncSearch", ui_incsearch, bg, "NONE" ],
[ "Search", ui_search, ui_fg_strong, "NONE" ], [ "Search", ui_search, ui_fg_strong, "NONE" ],
@ -179,7 +167,6 @@
[ "Question", "NONE", ui_fg_question, "italic" ], [ "Question", "NONE", ui_fg_question, "italic" ],
[ "WarningMsg", "NONE", ui_fg_warning, "italic" ], [ "WarningMsg", "NONE", ui_fg_warning, "italic" ],
[ "Cursor", ui_cursor_bg, ui_cursor_fg, "bold" ],
[ "CursorColumn", bg_cursorcolumn, "NONE", "NONE" ], [ "CursorColumn", bg_cursorcolumn, "NONE", "NONE" ],
[ "EndOfBuffer", bg, bg, "NONE" ], [ "EndOfBuffer", bg, bg, "NONE" ],
@ -190,11 +177,6 @@
[ "TabLineNum", "StatusLineNc"], [ "TabLineNum", "StatusLineNc"],
[ "TabLineNumSel", "StatusLine"], [ "TabLineNumSel", "StatusLine"],
[ "GitGutterDelete", "NONE", ui_sign_delete, "bold"],
[ "GitGutterChange", "NONE", ui_sign_change, "bold"],
[ "GitGutterAdd", "NONE", ui_sign_add, "bold"],
[ "GitGutterChangeDelete", "NONE", ui_sign_changedelete, "bold"],
[ "QuickScopePrimary", "IncSearch" ], [ "QuickScopePrimary", "IncSearch" ],
[ "QuickScopeSecondary", "Pmenu" ], [ "QuickScopeSecondary", "Pmenu" ],
@ -447,7 +429,7 @@
[ "CocInfoSign", "Question" ], [ "CocInfoSign", "Question" ],
[ "CocHintSign", "Question" ], [ "CocHintSign", "Question" ],
[ "CocHighlightText", "IncSearch" ], [ "CocHighlightText", "IncSearch" ],
[ "CocUnderline", diff_delete_bg, fg_error, "NONE" ], [ "CocUnderline", "NONE", fg_error, "NONE" ],
[ "LspErrorText", "ErrorMsg" ], [ "LspErrorText", "ErrorMsg" ],
[ "LspWarningText", "WarningMsg" ], [ "LspWarningText", "WarningMsg" ],
[ "LspInformationText", "Question" ], [ "LspInformationText", "Question" ],

View File

@ -12,6 +12,14 @@ endif
let colors_name = "paper-custom" let colors_name = "paper-custom"
if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi DiffAdd ctermbg=22 ctermfg=NONE cterm=NONE guibg=#e0ece0 guifg=NONE gui=NONE
hi DiffChange ctermbg=17 ctermfg=NONE cterm=NONE guibg=#e0e0ec guifg=NONE gui=NONE
hi DiffDelete ctermbg=52 ctermfg=NONE cterm=NONE guibg=#ece0e0 guifg=NONE gui=NONE
hi DiffText ctermbg=17 ctermfg=21 cterm=NONE guibg=#e0e0ec guifg=#656a7c gui=NONE
hi GitGutterDelete ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold
hi GitGutterChange ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#596171 gui=bold
hi GitGutterAdd ctermbg=NONE ctermfg=34 cterm=bold guibg=NONE guifg=#496349 gui=bold
hi GitGutterChangeDelete ctermbg=NONE ctermfg=126 cterm=bold guibg=NONE guifg=#5c4a5a gui=bold
hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#ffffff guifg=#999999 gui=NONE hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#ffffff guifg=#999999 gui=NONE
set background=light set background=light
hi Special ctermbg=NONE ctermfg=52 cterm=bold guibg=NONE guifg=#967978 gui=bold hi Special ctermbg=NONE ctermfg=52 cterm=bold guibg=NONE guifg=#967978 gui=bold
@ -64,10 +72,6 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi PmenuSel ctermbg=243 ctermfg=255 cterm=bold guibg=#828282 guifg=#444444 gui=bold hi PmenuSel ctermbg=243 ctermfg=255 cterm=bold guibg=#828282 guifg=#444444 gui=bold
hi PmenuThumb ctermbg=243 ctermfg=243 cterm=NONE guibg=#828282 guifg=#828282 gui=NONE hi PmenuThumb ctermbg=243 ctermfg=243 cterm=NONE guibg=#828282 guifg=#828282 gui=NONE
hi SpecialKey ctermbg=NONE ctermfg=52 cterm=NONE guibg=NONE guifg=#967978 gui=NONE hi SpecialKey ctermbg=NONE ctermfg=52 cterm=NONE guibg=NONE guifg=#967978 gui=NONE
hi DiffAdd ctermbg=22 ctermfg=NONE cterm=NONE guibg=#e0ece0 guifg=NONE gui=NONE
hi DiffChange ctermbg=17 ctermfg=NONE cterm=NONE guibg=#e0e0ec guifg=NONE gui=NONE
hi DiffDelete ctermbg=52 ctermfg=NONE cterm=NONE guibg=#ece0e0 guifg=NONE gui=NONE
hi DiffText ctermbg=17 ctermfg=21 cterm=NONE guibg=#e0e0ec guifg=#656a7c gui=NONE
hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#5a727c guifg=#ffffff gui=NONE hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#5a727c guifg=#ffffff gui=NONE
hi Search ctermbg=17 ctermfg=255 cterm=NONE guibg=#b7c3cd guifg=#444444 gui=NONE hi Search ctermbg=17 ctermfg=255 cterm=NONE guibg=#b7c3cd guifg=#444444 gui=NONE
hi Visual ctermbg=17 ctermfg=NONE cterm=NONE guibg=#ced8e0 guifg=NONE gui=NONE hi Visual ctermbg=17 ctermfg=NONE cterm=NONE guibg=#ced8e0 guifg=NONE gui=NONE
@ -84,16 +88,11 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi MoreMsg ctermbg=NONE ctermfg=255 cterm=italic guibg=NONE guifg=#444444 gui=italic hi MoreMsg ctermbg=NONE ctermfg=255 cterm=italic guibg=NONE guifg=#444444 gui=italic
hi Question ctermbg=NONE ctermfg=247 cterm=italic guibg=NONE guifg=#797532 gui=italic hi Question ctermbg=NONE ctermfg=247 cterm=italic guibg=NONE guifg=#797532 gui=italic
hi WarningMsg ctermbg=NONE ctermfg=166 cterm=italic guibg=NONE guifg=#a67038 gui=italic hi WarningMsg ctermbg=NONE ctermfg=166 cterm=italic guibg=NONE guifg=#a67038 gui=italic
hi Cursor ctermbg=255 ctermfg=0 cterm=bold guibg=#eee4e4 guifg=#131313 gui=bold
hi CursorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE hi CursorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE
hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#ffffff guifg=#ffffff gui=NONE hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#ffffff guifg=#ffffff gui=NONE
hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#aaaaaa gui=NONE hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#aaaaaa gui=NONE
hi link TabLineNum StatusLineNc hi link TabLineNum StatusLineNc
hi link TabLineNumSel StatusLine hi link TabLineNumSel StatusLine
hi GitGutterDelete ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold
hi GitGutterChange ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#596171 gui=bold
hi GitGutterAdd ctermbg=NONE ctermfg=34 cterm=bold guibg=NONE guifg=#496349 gui=bold
hi GitGutterChangeDelete ctermbg=NONE ctermfg=126 cterm=bold guibg=NONE guifg=#5c4a5a gui=bold
hi link QuickScopePrimary IncSearch hi link QuickScopePrimary IncSearch
hi link QuickScopeSecondary Pmenu hi link QuickScopeSecondary Pmenu
hi cssIdentifier ctermbg=NONE ctermfg=22 cterm=bold guibg=NONE guifg=#7a9678 gui=bold hi cssIdentifier ctermbg=NONE ctermfg=22 cterm=bold guibg=NONE guifg=#7a9678 gui=bold
@ -293,7 +292,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi link CocInfoSign Question hi link CocInfoSign Question
hi link CocHintSign Question hi link CocHintSign Question
hi link CocHighlightText IncSearch hi link CocHighlightText IncSearch
hi CocUnderline ctermbg=52 ctermfg=196 cterm=NONE guibg=#ece0e0 guifg=#c74444 gui=NONE hi CocUnderline ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#c74444 gui=NONE
hi link LspErrorText ErrorMsg hi link LspErrorText ErrorMsg
hi link LspWarningText WarningMsg hi link LspWarningText WarningMsg
hi link LspInformationText Question hi link LspInformationText Question
@ -323,6 +322,14 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi link shHereDoc Label hi link shHereDoc Label
elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
set t_Co=16 set t_Co=16
hi DiffAdd ctermbg=darkgreen ctermfg=NONE cterm=NONE
hi DiffChange ctermbg=darkblue ctermfg=NONE cterm=NONE
hi DiffDelete ctermbg=darkred ctermfg=NONE cterm=NONE
hi DiffText ctermbg=darkblue ctermfg=white cterm=NONE
hi GitGutterDelete ctermbg=NONE ctermfg=red cterm=bold
hi GitGutterChange ctermbg=NONE ctermfg=blue cterm=bold
hi GitGutterAdd ctermbg=NONE ctermfg=green cterm=bold
hi GitGutterChangeDelete ctermbg=NONE ctermfg=magenta cterm=bold
hi Normal ctermbg=black ctermfg=gray cterm=NONE hi Normal ctermbg=black ctermfg=gray cterm=NONE
set background=light set background=light
hi Special ctermbg=NONE ctermfg=darkred cterm=bold hi Special ctermbg=NONE ctermfg=darkred cterm=bold
@ -375,10 +382,6 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi PmenuSel ctermbg=gray ctermfg=white cterm=bold hi PmenuSel ctermbg=gray ctermfg=white cterm=bold
hi PmenuThumb ctermbg=gray ctermfg=gray cterm=NONE hi PmenuThumb ctermbg=gray ctermfg=gray cterm=NONE
hi SpecialKey ctermbg=NONE ctermfg=darkred cterm=NONE hi SpecialKey ctermbg=NONE ctermfg=darkred cterm=NONE
hi DiffAdd ctermbg=darkgreen ctermfg=NONE cterm=NONE
hi DiffChange ctermbg=darkblue ctermfg=NONE cterm=NONE
hi DiffDelete ctermbg=darkred ctermfg=NONE cterm=NONE
hi DiffText ctermbg=darkblue ctermfg=white cterm=NONE
hi IncSearch ctermbg=darkblue ctermfg=black cterm=NONE hi IncSearch ctermbg=darkblue ctermfg=black cterm=NONE
hi Search ctermbg=darkblue ctermfg=white cterm=NONE hi Search ctermbg=darkblue ctermfg=white cterm=NONE
hi Visual ctermbg=darkblue ctermfg=NONE cterm=NONE hi Visual ctermbg=darkblue ctermfg=NONE cterm=NONE
@ -395,16 +398,11 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi MoreMsg ctermbg=NONE ctermfg=white cterm=italic hi MoreMsg ctermbg=NONE ctermfg=white cterm=italic
hi Question ctermbg=NONE ctermfg=darkgray cterm=italic hi Question ctermbg=NONE ctermfg=darkgray cterm=italic
hi WarningMsg ctermbg=NONE ctermfg=yellow cterm=italic hi WarningMsg ctermbg=NONE ctermfg=yellow cterm=italic
hi Cursor ctermbg=white ctermfg=black cterm=bold
hi CursorColumn ctermbg=white ctermfg=NONE cterm=NONE hi CursorColumn ctermbg=white ctermfg=NONE cterm=NONE
hi EndOfBuffer ctermbg=black ctermfg=black cterm=NONE hi EndOfBuffer ctermbg=black ctermfg=black cterm=NONE
hi Noise ctermbg=NONE ctermfg=gray cterm=NONE hi Noise ctermbg=NONE ctermfg=gray cterm=NONE
hi link TabLineNum StatusLineNc hi link TabLineNum StatusLineNc
hi link TabLineNumSel StatusLine hi link TabLineNumSel StatusLine
hi GitGutterDelete ctermbg=NONE ctermfg=red cterm=bold
hi GitGutterChange ctermbg=NONE ctermfg=blue cterm=bold
hi GitGutterAdd ctermbg=NONE ctermfg=green cterm=bold
hi GitGutterChangeDelete ctermbg=NONE ctermfg=magenta cterm=bold
hi link QuickScopePrimary IncSearch hi link QuickScopePrimary IncSearch
hi link QuickScopeSecondary Pmenu hi link QuickScopeSecondary Pmenu
hi cssIdentifier ctermbg=NONE ctermfg=darkgreen cterm=bold hi cssIdentifier ctermbg=NONE ctermfg=darkgreen cterm=bold
@ -604,7 +602,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi link CocInfoSign Question hi link CocInfoSign Question
hi link CocHintSign Question hi link CocHintSign Question
hi link CocHighlightText IncSearch hi link CocHighlightText IncSearch
hi CocUnderline ctermbg=darkred ctermfg=red cterm=NONE hi CocUnderline ctermbg=NONE ctermfg=red cterm=NONE
hi link LspErrorText ErrorMsg hi link LspErrorText ErrorMsg
hi link LspWarningText WarningMsg hi link LspWarningText WarningMsg
hi link LspInformationText Question hi link LspInformationText Question