more sensible renaming

This commit is contained in:
ManjaroOne666 2018-11-04 22:56:10 +00:00
parent 7f8c2bed52
commit bbad5aa4c8
1 changed files with 104 additions and 102 deletions

View File

@ -42,62 +42,64 @@
# If your colors are defined correctly, the resulting colorscheme is guaranteed
# to work in GVim (Windows/Linux), MacVim, and any properly set up terminal emulator.
# TODO rename these to 'base' colors
black = ["#131313", 0, "black"]
bg_dark1 = ["#1B1C1D", 232, "gray"]
bg_dark2 = ["#1F1F1F", 232, "gray"]
# TODO dark should be weak, light should be strong
bg_weak1 = ["#1B1C1D", 232, "gray"]
bg_weak2 = ["#1F1F1F", 232, "gray"]
bg = ["#202122", 234, "black"]
fg_dark1 = ["#494646", 238, "gray"]
comment = ["#5d5d5d", 240, "gray"]
fg_dark2 = ["#716c6c", 243, "gray"]
fg_weak1 = ["#494646", 238, "gray"]
fg_comment = ["#5d5d5d", 240, "gray"]
fg_weak2 = ["#716c6c", 243, "gray"]
fg = ["#767070", 243, "gray"]
fg_light1 = ["#857f7f", 244, "darkgray"]
fg_light2 = ["#9a9393", 247, "darkgray"]
fg_light3 = ["#aeadad", 250, "white"]
fg_light4 = ["#eee4e4", 255, "white"]
fg_strong1 = ["#857f7f", 244, "darkgray"]
fg_strong2 = ["#9a9393", 247, "darkgray"]
fg_strong3 = ["#aeadad", 250, "white"]
fg_strong4 = ["#eee4e4", 255, "white"]
ui_bg = ["#3f3f3f", 238, "gray"]
ui_dark1 = ["#494646", 238, "gray"]
ui_dark2 = ["#5d5959", 240, "gray"]
ui_fg_weak1 = ["#494646", 238, "gray"]
ui_fg_weak2 = ["#5d5959", 240, "gray"]
ui_fg = ["#716c6c", 243, "gray"]
ui_light1 = ["#857f7f", 244, "darkgray"]
ui_light2 = ["#9a9393", 247, "darkgray"]
ui_light3 = ["#aeadad", 250, "white"]
ui_light4 = ["#eee4e4", 255, "white"]
ui_fg_strong1 = ["#857f7f", 244, "darkgray"]
ui_fg_strong2 = ["#9a9393", 247, "darkgray"]
ui_fg_strong3 = ["#aeadad", 250, "white"]
ui_fg_strong4 = ["#eee4e4", 255, "white"]
ui_cursor_bg = ["#eee4e4", 255, "white"]
ui_cursor_fg = ["#131313", 0, "black"]
menu_bg = ["#333535", 237, "black"]
menu_fg = ui_light1
menu_sel = ui_light3
menu_fg = ui_fg_strong1
menu_sel = ui_fg_strong3
# UI Colours
red_diff = ["#282020", 52, "darkred"]
diff_delete_bg = ["#282020", 52, "darkred"]
red_bg = ["#463838", 52, "darkred"]
red_ui1 = ["#655757", 124, "red"]
red_ui2 = ["#7b6a6a", 124, "red"]
red_ui3 = ["#725454", 124, "red"]
red_ui4 = ["#916c6c", 124, "red"]
green_diff = ["#202820", 22, "darkgreen"]
diff_add_bg = ["#202820", 22, "darkgreen"]
green_ui1 = ["#515b51", 34, "green"]
green_ui2 = ["#626e62", 34, "green"]
green_ui3 = ["#496349", 34, "green"]
blue_diff = ["#242528", 17, "darkblue"]
diff_change_bg = ["#242528", 17, "darkblue"]
blue_bg0 = ["#384046", 17, "darkblue"]
blue_bg1 = ["#49535a", 17, "darkblue"]
inc_search = ["#93adc2", 17, "darkblue"]
blue_ui1 = ["#62626c", 19, "blue"]
blue_diff_text = ["#656a7c", 21, "ui_light4"]
diff_change_fg = ["#656a7c", 21, "blue"]
blue_ui3 = ["#596171", 19, "blue"]
purple_ui3 = ["#5c4a5a", 126, "magenta"]
error = ["#c74444", 196, "red"]
error_ui = ["#833838", 196, "red"]
error_ui_dark = ["#6a2e2e", 196, "red"]
error_ui_fg_weak = ["#6a2e2e", 196, "red"]
warning = ["#a67038", 166, "yellow"]
warning_ui = ["#775538", 166, "yellow"]
warning_ui_dark = ["#553d2b", 166, "yellow"]
warning_ui_fg_weak = ["#553d2b", 166, "yellow"]
info = ["#797532", 247, "darkgray"]
info_ui = ["#615b41", 247, "darkgray"]
info_ui_dark = ["#44402e", 247, "darkgray"]
info_ui_fg_weak = ["#44402e", 247, "darkgray"]
darkred1 = ["#373030", 237, "darkred"]
darkred2 = ["#6b5d5d", 52, "darkred"]
@ -195,29 +197,29 @@
[ "Structure", "StorageClass"],
[ "TypeDef", "StorageClass"],
[ "Constant", "NONE", fg_light4, "italic" ],
[ "String", "NONE", fg_light3, "italic" ],
[ "Constant", "NONE", fg_strong4, "italic" ],
[ "String", "NONE", fg_strong3, "italic" ],
[ "Character", "String" ],
[ "Number", "String" ],
[ "Boolean", "String" ],
[ "Float", "String" ],
[ "Folded", "NONE", fg_light3, "NONE" ],
[ "Folded", "NONE", fg_strong3, "NONE" ],
[ "Statement", "NONE", fg, "NONE" ],
[ "Conditional", "NONE", fg_light3, "bold" ],
[ "Repeat", "NONE", fg_light2, "bold" ],
[ "Label", "NONE", fg_light1, "bold" ],
[ "Operator", "NONE", fg_light2, "bold" ],
[ "Keyword", "NONE", fg_light1, "bold" ],
[ "Conditional", "NONE", fg_strong3, "bold" ],
[ "Repeat", "NONE", fg_strong2, "bold" ],
[ "Label", "NONE", fg_strong1, "bold" ],
[ "Operator", "NONE", fg_strong2, "bold" ],
[ "Keyword", "NONE", fg_strong1, "bold" ],
[ "Exception", "NONE", darkred2, "bold" ],
[ "PreProc", "NONE", fg_dark1, "bold" ],
[ "Include", "NONE", fg_dark1, "NONE" ],
[ "PreProc", "NONE", fg_weak1, "bold" ],
[ "Include", "NONE", fg_weak1, "NONE" ],
[ "Comment", "NONE", comment, "italic" ],
[ "SpecialComment", "NONE", fg_light1, "italic"],
[ "Todo", "NONE", fg_light2, "italic" ],
[ "Comment", "NONE", fg_comment, "italic" ],
[ "SpecialComment", "NONE", fg_strong1, "italic"],
[ "Todo", "NONE", fg_strong2, "italic" ],
[ "Ignore", "NONE", bg, "NONE" ],
@ -225,22 +227,22 @@
[ "Underlined", "NONE", "NONE", "underline" ],
[ "StatusLine", ui_bg, ui_light3, "NONE" ],
[ "StatusLine", ui_bg, ui_fg_strong3, "NONE" ],
[ "StatusLineNC", ui_bg, ui_fg, "NONE" ],
[ "TabLine", ui_bg, ui_fg, "NONE" ],
[ "TabLineFill", ui_bg, ui_bg, "NONE" ],
[ "TabLineSel", ui_bg, ui_light3, "NONE" ],
[ "TabLineSel", ui_bg, ui_fg_strong3, "NONE" ],
[ "VertSplit", bg, ui_bg, "NONE" ],
[ "FoldColumn", bg, fg_dark1, "NONE" ],
[ "ColorColumn", bg_dark1, "NONE", "NONE" ],
[ "SignColumn", bg, ui_light3, "NONE" ],
[ "CursorLine", bg_dark1, "NONE", "NONE" ],
[ "FoldColumn", bg, fg_weak1, "NONE" ],
[ "ColorColumn", bg_weak1, "NONE", "NONE" ],
[ "SignColumn", bg, ui_fg_strong3, "NONE" ],
[ "CursorLine", bg_weak1, "NONE", "NONE" ],
[ "Title", "NONE", fg_light2, "bold" ],
[ "Title", "NONE", fg_strong2, "bold" ],
[ "LineNr", bg, ui_dark2, "NONE" ],
[ "CursorLineNr", bg, ui_light1, "NONE" ],
[ "LineNr", bg, ui_fg_weak2, "NONE" ],
[ "CursorLineNr", bg, ui_fg_strong1, "NONE" ],
# [ "helpLeadBlank", "NONE", grayfg, "NONE" ],
# [ "helpNormal", "NONE", grayfg, "NONE" ],
@ -252,18 +254,18 @@
[ "SpecialKey", "NONE", lightred3, "NONE" ],
[ "DiffAdd", green_diff, "NONE", "NONE" ],
[ "DiffChange", blue_diff, "NONE", "NONE" ],
[ "DiffDelete", red_diff, "NONE", "NONE" ],
[ "DiffText", blue_diff, blue_diff_text, "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", inc_search, bg, "NONE" ],
[ "Search", blue_bg1, ui_light3, "NONE" ],
[ "Search", blue_bg1, ui_fg_strong3, "NONE" ],
[ "Visual", blue_bg0, "NONE", "NONE" ],
[ "VisualNOS", red_bg, "NONE", "NONE" ],
[ "Directory", "NONE", ui_light3, "NONE" ],
[ "Directory", "NONE", ui_fg_strong3, "NONE" ],
[ "MatchParen", blue_bg1, "NONE", "bold" ],
@ -272,37 +274,37 @@
[ "SpellLocal", "NONE", info, "NONE", warning ],
[ "SpellRare", "NONE", info, "NONE", warning ],
[ "WildMenu", ui_bg, ui_light4, "bold" ],
[ "WildMenu", ui_bg, ui_fg_strong4, "bold" ],
[ "ErrorMsg", "NONE", error, "bold" ],
[ "ModeMsg", "NONE", ui_light4, "bold" ],
[ "MoreMsg", "NONE", ui_light4, "NONE" ],
[ "ModeMsg", "NONE", ui_fg_strong4, "bold" ],
[ "MoreMsg", "NONE", ui_fg_strong4, "NONE" ],
[ "Question", "NONE", info, "NONE" ],
[ "WarningMsg", "NONE", warning, "bold" ],
[ "Cursor", ui_light4, black, "bold" ],
[ "CursorColumn", bg_dark2, "NONE", "NONE" ],
[ "Cursor", ui_cursor_bg, ui_cursor_fg, "bold" ],
[ "CursorColumn", bg_weak2, "NONE", "NONE" ],
[ "EndOfBuffer", bg, bg, "NONE" ],
[ "Noise", "NONE", ui_dark2, "NONE"],
[ "Noise", "NONE", ui_fg_weak2, "NONE"],
# tabline, statusline
[ "TabLineNum", ui_bg, ui_fg, "bold"],
[ "TabLineNumSel", ui_bg, ui_light1, "bold"],
[ "TabLineNumSel", ui_bg, ui_fg_strong1, "bold"],
[ "StatusLineNoise", ui_bg, ui_dark2, "NONE"],
[ "StatusLineNoise", ui_bg, ui_fg_weak2, "NONE"],
[ "StatusLineNoiseActive", ui_bg, ui_fg, "NONE"],
[ "StatusLineBufferNr", ui_bg, ui_light2, "bold"],
[ "StatusLineBufferNrActive", ui_bg, ui_light3, "bold"],
[ "StatusLineBufferNr", ui_bg, ui_fg_strong2, "bold"],
[ "StatusLineBufferNrActive", ui_bg, ui_fg_strong3, "bold"],
[ "StatusLinePercent", ui_bg, ui_fg, "bold"],
[ "StatusLinePercentActive", ui_bg, ui_light2, "bold"],
[ "StatusLinePercentActive", ui_bg, ui_fg_strong2, "bold"],
[ "StatusLineLinecount", ui_bg, ui_fg, "bold"],
[ "StatusLineLinecountActive", ui_bg, ui_light1, "bold"],
[ "StatusLineLinecountActive", ui_bg, ui_fg_strong1, "bold"],
[ "StatusLineDivActive", ui_fg, ui_fg, "NONE"],
[ "StatusLineDivInput", blue_bg0, blue_bg0, "NONE"],
@ -311,34 +313,34 @@
[ "StatusLineFileInfo", "NONE", ui_fg, "italic"],
[ "StatusLineFile", ui_bg, ui_light2, "italic"],
[ "StatusLineFileActive", ui_bg, ui_light3, "italic"],
[ "StatusLineFile", ui_bg, ui_fg_strong2, "italic"],
[ "StatusLineFileActive", ui_bg, ui_fg_strong3, "italic"],
[ "StatusLineDir", ui_bg, ui_fg, "italic"],
[ "StatusLineDirActive", ui_bg, ui_fg, "italic"],
[ "StatusLineExt", ui_bg, ui_fg, "italic"],
[ "StatusLineExtActive", ui_bg, ui_light1, "italic"],
[ "StatusLineDot", ui_bg, ui_dark2, "italic"],
[ "StatusLineDotActive", ui_bg, ui_dark2, "italic"],
[ "StatusLineExtActive", ui_bg, ui_fg_strong1, "italic"],
[ "StatusLineDot", ui_bg, ui_fg_weak2, "italic"],
[ "StatusLineDotActive", ui_bg, ui_fg_weak2, "italic"],
[ "StatusLineFileReadOnly", ui_bg, red_ui3, "italic"],
[ "StatusLineFileReadOnlyActive", "NONE", red_ui3, "italic"],
[ "StatusLineWarning", ui_bg, ui_light1, "bold"],
[ "StatusLineWarning", ui_bg, ui_fg_strong1, "bold"],
[ "StatusLineWarningActive", "NONE", red_ui3, "bold"],
[ "LinterDash", "NONE", fg_dark1, "NONE"],
[ "LinterDashActive", "NONE", ui_dark2, "NONE"],
[ "LinterDash", "NONE", fg_weak1, "NONE"],
[ "LinterDashActive", "NONE", ui_fg_weak2, "NONE"],
[ "LinterError", "NONE", error_ui_dark, "bold"],
[ "LinterError", "NONE", error_ui_fg_weak, "bold"],
[ "LinterErrorActive", "NONE", error_ui, "bold"],
[ "LinterErrorStyle", "NONE", error_ui_dark, "NONE"],
[ "LinterErrorStyle", "NONE", error_ui_fg_weak, "NONE"],
[ "LinterErrorStyleActive", "NONE", error_ui, "NONE"],
[ "LinterWarning", "NONE", warning_ui_dark, "bold"],
[ "LinterWarning", "NONE", warning_ui_fg_weak, "bold"],
[ "LinterWarningActive", "NONE", warning_ui, "bold"],
[ "LinterWarningStyle", "NONE", warning_ui_dark, "NONE"],
[ "LinterWarningStyle", "NONE", warning_ui_fg_weak, "NONE"],
[ "LinterWarningStyleActive", "NONE", warning_ui, "NONE"],
[ "LinterInfo", "NONE", info_ui_dark, "bold"],
[ "LinterInfo", "NONE", info_ui_fg_weak, "bold"],
[ "LinterInfoActive", "NONE", info_ui, "bold"],
[ "GitGutterDelete", "NONE", red_ui3, "bold"],
@ -350,8 +352,8 @@
[ "cssIdentifier", "NONE", green6, "bold" ],
[ "cssClass", "NONE", green5, "NONE" ],
[ "cssFunction", "NONE", fg_light1, "bold" ],
[ "cssProp", "NONE", fg_dark2, "NONE" ],
[ "cssFunction", "NONE", fg_strong1, "bold" ],
[ "cssProp", "NONE", fg_weak2, "NONE" ],
[ "scssVariable", "NONE", green7, "bold" ],
[ "cssAttr", "String"],
@ -367,7 +369,7 @@
[ "cssKeyFrameSelector", "Label" ],
[ "cssFunctionName", "cssIdentifier" ],
[ "cssBraces", "Noise" ],
[ "cssUnitDecorators", "NONE", fg_light2, "NONE" ],
[ "cssUnitDecorators", "NONE", fg_strong2, "NONE" ],
[ "scssSelector", "cssClass" ],
[ "scssSelectorName", "scssSelector" ],
[ "scssSelectorChar", "cssIdentifier" ],
@ -458,7 +460,7 @@
[ "jsFuncCall", "Identifier" ],
[ "jsOperator", "Operator" ],
[ "jsVariableDef", "Identifier" ],
[ "jsGlobalObjects", "NONE", fg_light2, "bold" ],
[ "jsGlobalObjects", "NONE", fg_strong2, "bold" ],
[ "jsGlobalNodeObjects", "jsGlobalObjects" ],
[ "jsExceptions", "jsGlobalObjects" ],
[ "jsBuiltins", "jsGlobalObjects" ],
@ -482,7 +484,7 @@
[ "pythonNoise", "Noise" ],
[ "pythonExtraOperator", "Operator" ],
[ "pythonDocString", "SpecialComment" ],
[ "pythonSelf", "NONE", fg_dark1, "bold" ],
[ "pythonSelf", "NONE", fg_weak1, "bold" ],
# sql
@ -490,7 +492,7 @@
# vim
[ "vimFoldMarker", "NONE", fg_dark1, "NONE"],
[ "vimFoldMarker", "NONE", fg_weak1, "NONE"],
[ "vimMap", "Noise" ],
[ "vimAbb", "vimMap" ],
[ "VimCommand", "Statement" ],
@ -527,7 +529,7 @@
# extra whitespace
[ "ExtraWhitespace", error_ui_dark ,"NONE", "NONE" ],
[ "ExtraWhitespace", error_ui_fg_weak ,"NONE", "NONE" ],
# php
@ -536,9 +538,9 @@
# quickfix
[ "QuickfixLine", "NONE", ui_light2, "bold" ],
[ "qfLineNr", "NONE", ui_dark2, "italic"],
[ "qfFilename", "NONE", ui_light1, "bold" ],
[ "QuickfixLine", "NONE", ui_fg_strong2, "bold" ],
[ "qfLineNr", "NONE", ui_fg_weak2, "italic"],
[ "qfFilename", "NONE", ui_fg_strong1, "bold" ],
[ "qfSeparator", "Ignore" ],
[ "qfError", "ErrorMsg" ],
@ -558,30 +560,30 @@
# ctrl-p highlighting
# :h ctrlp-customization
[ "CtrlPPrtBase", ui_light2, ui_dark2, "bold" ],
[ "CtrlPPrtText", ui_light2, black, "bold"],
[ "CtrlPMatch", "NONE", ui_light2, "bold"],
[ "CtrlPMode1", "NONE", ui_light3, "bold"],
[ "CtrlPMode2", "NONE", ui_light1, "NONE"],
[ "CtrlPPrtBase", ui_cursor_bg, ui_cursor_fg, "bold" ],
[ "CtrlPPrtText", ui_cursor_bg, ui_cursor_fg, "bold"],
[ "CtrlPMatch", "NONE", ui_fg_strong2, "bold"],
[ "CtrlPMode1", "NONE", ui_fg_strong3, "bold"],
[ "CtrlPMode2", "NONE", ui_fg_strong1, "NONE"],
[ "CtrlPNoEntries", "NONE", red_ui4, "bold" ],
[ "CtrlPBufferNr", "NONE", ui_light2, "bold" ],
[ "CtrlPBufferInd", "NONE", ui_light4, "bold" ],
[ "CtrlPBufferPath", "NONE", ui_dark2, "NONE" ],
[ "CtrlPBufferNr", "NONE", ui_fg_strong2, "bold" ],
[ "CtrlPBufferInd", "NONE", ui_fg_strong4, "bold" ],
[ "CtrlPBufferPath", "NONE", ui_fg_weak2, "NONE" ],
[ "CtrlPBufferHid", "NONE", ui_fg, "NONE" ],
[ "CtrlPBufferHidMod", "NONE", red_ui2, "NONE" ],
[ "CtrlPBufferVis", "Normal" ],
[ "CtrlPBufferVisMod", "NONE", red_ui3, "NONE" ],
[ "CtrlPBufferCur", "NONE", ui_light3, "bold" ],
[ "CtrlPBufferCur", "NONE", ui_fg_strong3, "bold" ],
[ "CtrlPBufferCurMod", "NONE", red_ui4, "NONE" ],
[ "CtrlPBufName", "NONE", red_ui4, "NONE" ],
[ "CtrlPTagKind", "NONE", red_ui4, "bold" ],
[ "CtrlPqfLineCol", "NONE", red_ui3, "bold" ],
[ "CtrlPUndoT", "NONE", ui_light1, "NONE" ],
[ "CtrlPUndoBr", "NONE", ui_dark1, "NONE" ],
[ "CtrlPUndoNr", "NONE", ui_dark2, "NONE" ],
[ "CtrlPUndoT", "NONE", ui_fg_strong1, "NONE" ],
[ "CtrlPUndoBr", "NONE", ui_fg_weak1, "NONE" ],
[ "CtrlPUndoNr", "NONE", ui_fg_weak2, "NONE" ],
[ "CtrlPUndoSv", "NONE", red_ui3, "NONE" ],
[ "CtrlPUndoPo", "NONE", ui_light3, "bold" ],
[ "CtrlPUndoPo", "NONE", ui_fg_strong3, "bold" ],
# i3config
[ "Variable", "Function" ],