From 7f8c2bed521857d65cd7fbda5899cfc1012c0ae1 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Sun, 4 Nov 2018 22:28:44 +0000 Subject: [PATCH] sensible names --- vim/colors/monotonous-dark.erb | 287 +++++++++++++++++---------------- 1 file changed, 145 insertions(+), 142 deletions(-) diff --git a/vim/colors/monotonous-dark.erb b/vim/colors/monotonous-dark.erb index 50eb9a7..5f1da77 100644 --- a/vim/colors/monotonous-dark.erb +++ b/vim/colors/monotonous-dark.erb @@ -44,22 +44,60 @@ # TODO rename these to 'base' colors black = ["#131313", 0, "black"] - gray_bg_dark2 = ["#181A1B", 232, "gray"] - gray_bg_dark3 = ["#1B1C1D", 232, "gray"] - gray_bg_dark4 = ["#1F1F1F", 232, "gray"] - gray0 = ["#1f2121", 232, "black"] - gray_bg = ["#202122", 234, "black"] - gray1 = ["#333535", 237, "black"] - gray_deco = ["#3f3f3f", 238, "gray"] - gray2 = ["#494646", 238, "gray"] - gray3 = ["#5d5959", 240, "gray"] - gray3_pure = ["#5d5d5d", 240, "gray"] - gray4 = ["#716c6c", 243, "gray"] - gray_fg = ["#767070", 243, "gray"] - gray5 = ["#857f7f", 244, "darkgray"] - gray6 = ["#9a9393", 247, "darkgray"] - gray7 = ["#aeadad", 250, "white"] - white = ["#eee4e4", 255, "white"] + bg_dark1 = ["#1B1C1D", 232, "gray"] + bg_dark2 = ["#1F1F1F", 232, "gray"] + bg = ["#202122", 234, "black"] + fg_dark1 = ["#494646", 238, "gray"] + comment = ["#5d5d5d", 240, "gray"] + fg_dark2 = ["#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"] + + ui_bg = ["#3f3f3f", 238, "gray"] + ui_dark1 = ["#494646", 238, "gray"] + ui_dark2 = ["#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"] + + menu_bg = ["#333535", 237, "black"] + menu_fg = ui_light1 + menu_sel = ui_light3 + + # UI Colours + red_diff = ["#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"] + green_ui1 = ["#515b51", 34, "green"] + green_ui2 = ["#626e62", 34, "green"] + green_ui3 = ["#496349", 34, "green"] + blue_diff = ["#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"] + 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"] + warning = ["#a67038", 166, "yellow"] + warning_ui = ["#775538", 166, "yellow"] + warning_ui_dark = ["#553d2b", 166, "yellow"] + info = ["#797532", 247, "darkgray"] + info_ui = ["#615b41", 247, "darkgray"] + info_ui_dark = ["#44402e", 247, "darkgray"] darkred1 = ["#373030", 237, "darkred"] darkred2 = ["#6b5d5d", 52, "darkred"] @@ -107,41 +145,6 @@ yellow6 = ["#d0d095", 34, "yellow"] yellow7 = ["#d5d5a1", 34, "yellow"] - # UI Colours - red_diff = ["#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"] - green_ui1 = ["#515b51", 34, "green"] - green_ui2 = ["#626e62", 34, "green"] - green_ui3 = ["#496349", 34, "green"] - blue_diff = ["#242528", 17, "darkblue"] - blue_bg0 = ["#384046", 17, "darkblue"] - blue_bg1 = ["#49535a", 17, "darkblue"] - blue_bg2 = ["#93adc2", 17, "darkblue"] - blue_ui1 = ["#62626c", 19, "blue"] - blue_diff_text = ["#656a7c", 21, "white"] - blue_ui2 = ["#777783", 19, "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"] - warning = ["#a67038", 166, "yellow"] - warning_ui = ["#775538", 166, "yellow"] - warning_ui_dark = ["#553d2b", 166, "yellow"] - info = ["#797532", 247, "darkgray"] - info_ui = ["#615b41", 247, "darkgray"] - info_ui_dark = ["#44402e", 247, "darkgray"] - - menubg = gray1 - menufg = gray5 - menusel = gray7 - # Step 3: highlights # @@ -178,7 +181,7 @@ # TODO example # remove any if you want a working colorscheme. highlights = [ - [ "Normal", gray_bg, gray_fg, "NONE" ], + [ "Normal", bg, fg, "NONE" ], [ "Special", "NONE", lightred2, "bold" ], [ "NonText", "NONE", lightred3, "NONE" ], @@ -192,75 +195,75 @@ [ "Structure", "StorageClass"], [ "TypeDef", "StorageClass"], - [ "Constant", "NONE", white, "italic" ], - [ "String", "NONE", gray7, "italic" ], + [ "Constant", "NONE", fg_light4, "italic" ], + [ "String", "NONE", fg_light3, "italic" ], [ "Character", "String" ], [ "Number", "String" ], [ "Boolean", "String" ], [ "Float", "String" ], - [ "Folded", "NONE", gray7, "NONE" ], + [ "Folded", "NONE", fg_light3, "NONE" ], - [ "Statement", "NONE", gray_fg, "NONE" ], - [ "Conditional", "NONE", gray7, "bold" ], - [ "Repeat", "NONE", gray6, "bold" ], - [ "Label", "NONE", gray5, "bold" ], - [ "Operator", "NONE", gray6, "bold" ], - [ "Keyword", "NONE", gray5, "bold" ], + [ "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" ], [ "Exception", "NONE", darkred2, "bold" ], - [ "PreProc", "NONE", gray2, "bold" ], - [ "Include", "NONE", gray2, "NONE" ], + [ "PreProc", "NONE", fg_dark1, "bold" ], + [ "Include", "NONE", fg_dark1, "NONE" ], - [ "Comment", "NONE", gray3_pure, "italic" ], - [ "SpecialComment", "NONE", gray5, "italic"], - [ "Todo", "NONE", gray6, "italic" ], + [ "Comment", "NONE", comment, "italic" ], + [ "SpecialComment", "NONE", fg_light1, "italic"], + [ "Todo", "NONE", fg_light2, "italic" ], - [ "Ignore", "NONE", gray_bg, "NONE" ], + [ "Ignore", "NONE", bg, "NONE" ], [ "Error", "NONE", error, "bold" ], [ "Underlined", "NONE", "NONE", "underline" ], - [ "StatusLine", gray_deco, gray7, "NONE" ], - [ "StatusLineNC", gray_deco, gray4, "NONE" ], - [ "TabLine", gray_deco, gray4, "NONE" ], - [ "TabLineFill", gray_deco, gray_deco, "NONE" ], - [ "TabLineSel", gray_deco, gray7, "NONE" ], + [ "StatusLine", ui_bg, ui_light3, "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" ], - [ "VertSplit", gray_bg, gray_deco, "NONE" ], - [ "FoldColumn", gray_bg, gray2, "NONE" ], - [ "ColorColumn", gray_bg_dark3, "NONE", "NONE" ], - [ "SignColumn", gray_bg, gray7, "NONE" ], - [ "CursorLine", gray_bg_dark3, "NONE", "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" ], - [ "Title", "NONE", gray6, "bold" ], + [ "Title", "NONE", fg_light2, "bold" ], - [ "LineNr", gray_bg, gray3, "NONE" ], - [ "CursorLineNr", gray_bg, gray5, "NONE" ], + [ "LineNr", bg, ui_dark2, "NONE" ], + [ "CursorLineNr", bg, ui_light1, "NONE" ], # [ "helpLeadBlank", "NONE", grayfg, "NONE" ], # [ "helpNormal", "NONE", grayfg, "NONE" ], - [ "Pmenu", menubg, menufg, "NONE" ], - [ "PmenuSbar", menubg, menubg, "NONE" ], - [ "PmenuSel", menubg, menusel, "bold" ], - [ "PmenuThumb", menufg, menufg, "NONE" ], + [ "Pmenu", menu_bg, menu_fg, "NONE" ], + [ "PmenuSbar", menu_bg, menu_bg, "NONE" ], + [ "PmenuSel", menu_bg, menu_sel, "bold" ], + [ "PmenuThumb", menu_fg, menu_fg, "NONE" ], - [ "SpecialKey", "NONE", red_ui1, "NONE" ], + [ "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" ], - [ "IncSearch", blue_bg2, gray_bg, "NONE" ], - [ "Search", blue_bg1, gray7, "NONE" ], + [ "IncSearch", inc_search, bg, "NONE" ], + [ "Search", blue_bg1, ui_light3, "NONE" ], [ "Visual", blue_bg0, "NONE", "NONE" ], [ "VisualNOS", red_bg, "NONE", "NONE" ], - [ "Directory", "NONE", gray7, "NONE" ], + [ "Directory", "NONE", ui_light3, "NONE" ], [ "MatchParen", blue_bg1, "NONE", "bold" ], @@ -269,61 +272,61 @@ [ "SpellLocal", "NONE", info, "NONE", warning ], [ "SpellRare", "NONE", info, "NONE", warning ], - [ "WildMenu", gray_deco, white, "bold" ], + [ "WildMenu", ui_bg, ui_light4, "bold" ], [ "ErrorMsg", "NONE", error, "bold" ], - [ "ModeMsg", "NONE", white, "bold" ], - [ "MoreMsg", "NONE", white, "NONE" ], + [ "ModeMsg", "NONE", ui_light4, "bold" ], + [ "MoreMsg", "NONE", ui_light4, "NONE" ], [ "Question", "NONE", info, "NONE" ], [ "WarningMsg", "NONE", warning, "bold" ], - [ "Cursor", white, black, "bold" ], - [ "CursorColumn", gray_bg_dark4, "NONE", "NONE" ], + [ "Cursor", ui_light4, black, "bold" ], + [ "CursorColumn", bg_dark2, "NONE", "NONE" ], - [ "EndOfBuffer", gray_bg, gray_bg, "NONE" ], + [ "EndOfBuffer", bg, bg, "NONE" ], - [ "Noise", "NONE", gray3, "NONE"], + [ "Noise", "NONE", ui_dark2, "NONE"], # tabline, statusline - [ "TabLineNum", gray_deco, gray4, "bold"], - [ "TabLineNumSel", gray_deco, gray5, "bold"], + [ "TabLineNum", ui_bg, ui_fg, "bold"], + [ "TabLineNumSel", ui_bg, ui_light1, "bold"], - [ "StatusLineNoise", gray_deco, gray3, "NONE"], - [ "StatusLineNoiseActive", gray_deco, gray4, "NONE"], + [ "StatusLineNoise", ui_bg, ui_dark2, "NONE"], + [ "StatusLineNoiseActive", ui_bg, ui_fg, "NONE"], - [ "StatusLineBufferNr", gray_deco, gray6, "bold"], - [ "StatusLineBufferNrActive", gray_deco, gray7, "bold"], + [ "StatusLineBufferNr", ui_bg, ui_light2, "bold"], + [ "StatusLineBufferNrActive", ui_bg, ui_light3, "bold"], - [ "StatusLinePercent", gray_deco, gray4, "bold"], - [ "StatusLinePercentActive", gray_deco, gray6, "bold"], - [ "StatusLineLinecount", gray_deco, gray4, "bold"], - [ "StatusLineLinecountActive", gray_deco, gray5, "bold"], + [ "StatusLinePercent", ui_bg, ui_fg, "bold"], + [ "StatusLinePercentActive", ui_bg, ui_light2, "bold"], + [ "StatusLineLinecount", ui_bg, ui_fg, "bold"], + [ "StatusLineLinecountActive", ui_bg, ui_light1, "bold"], - [ "StatusLineDivActive", gray4, gray4, "NONE"], + [ "StatusLineDivActive", ui_fg, ui_fg, "NONE"], [ "StatusLineDivInput", blue_bg0, blue_bg0, "NONE"], [ "StatusLineDivMod", red_ui1, red_ui1, "NONE"], [ "StatusLineDivModActive", red_ui4, red_ui4, "NONE"], - [ "StatusLineFileInfo", "NONE", gray4, "italic"], + [ "StatusLineFileInfo", "NONE", ui_fg, "italic"], - [ "StatusLineFile", gray_deco, gray6, "italic"], - [ "StatusLineFileActive", gray_deco, gray7, "italic"], - [ "StatusLineDir", gray_deco, gray4, "italic"], - [ "StatusLineDirActive", gray_deco, gray4, "italic"], - [ "StatusLineExt", gray_deco, gray4, "italic"], - [ "StatusLineExtActive", gray_deco, gray5, "italic"], - [ "StatusLineDot", gray_deco, gray3, "italic"], - [ "StatusLineDotActive", gray_deco, gray3, "italic"], + [ "StatusLineFile", ui_bg, ui_light2, "italic"], + [ "StatusLineFileActive", ui_bg, ui_light3, "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"], - [ "StatusLineFileReadOnly", gray_deco, red_ui3, "italic"], + [ "StatusLineFileReadOnly", ui_bg, red_ui3, "italic"], [ "StatusLineFileReadOnlyActive", "NONE", red_ui3, "italic"], - [ "StatusLineWarning", gray_deco, gray5, "bold"], + [ "StatusLineWarning", ui_bg, ui_light1, "bold"], [ "StatusLineWarningActive", "NONE", red_ui3, "bold"], - [ "LinterDash", "NONE", gray2, "NONE"], - [ "LinterDashActive", "NONE", gray3, "NONE"], + [ "LinterDash", "NONE", fg_dark1, "NONE"], + [ "LinterDashActive", "NONE", ui_dark2, "NONE"], [ "LinterError", "NONE", error_ui_dark, "bold"], [ "LinterErrorActive", "NONE", error_ui, "bold"], @@ -347,8 +350,8 @@ [ "cssIdentifier", "NONE", green6, "bold" ], [ "cssClass", "NONE", green5, "NONE" ], - [ "cssFunction", "NONE", gray5, "bold" ], - [ "cssProp", "NONE", gray4, "NONE" ], + [ "cssFunction", "NONE", fg_light1, "bold" ], + [ "cssProp", "NONE", fg_dark2, "NONE" ], [ "scssVariable", "NONE", green7, "bold" ], [ "cssAttr", "String"], @@ -364,7 +367,7 @@ [ "cssKeyFrameSelector", "Label" ], [ "cssFunctionName", "cssIdentifier" ], [ "cssBraces", "Noise" ], - [ "cssUnitDecorators", "NONE", gray6, "NONE" ], + [ "cssUnitDecorators", "NONE", fg_light2, "NONE" ], [ "scssSelector", "cssClass" ], [ "scssSelectorName", "scssSelector" ], [ "scssSelectorChar", "cssIdentifier" ], @@ -455,7 +458,7 @@ [ "jsFuncCall", "Identifier" ], [ "jsOperator", "Operator" ], [ "jsVariableDef", "Identifier" ], - [ "jsGlobalObjects", "NONE", gray6, "bold" ], + [ "jsGlobalObjects", "NONE", fg_light2, "bold" ], [ "jsGlobalNodeObjects", "jsGlobalObjects" ], [ "jsExceptions", "jsGlobalObjects" ], [ "jsBuiltins", "jsGlobalObjects" ], @@ -479,7 +482,7 @@ [ "pythonNoise", "Noise" ], [ "pythonExtraOperator", "Operator" ], [ "pythonDocString", "SpecialComment" ], - [ "pythonSelf", "NONE", gray2, "bold" ], + [ "pythonSelf", "NONE", fg_dark1, "bold" ], # sql @@ -487,7 +490,7 @@ # vim - [ "vimFoldMarker", "NONE", gray2, "NONE"], + [ "vimFoldMarker", "NONE", fg_dark1, "NONE"], [ "vimMap", "Noise" ], [ "vimAbb", "vimMap" ], [ "VimCommand", "Statement" ], @@ -533,9 +536,9 @@ # quickfix - [ "QuickfixLine", "NONE", gray6, "bold" ], - [ "qfLineNr", "NONE", gray3, "italic"], - [ "qfFilename", "NONE", gray5, "bold" ], + [ "QuickfixLine", "NONE", ui_light2, "bold" ], + [ "qfLineNr", "NONE", ui_dark2, "italic"], + [ "qfFilename", "NONE", ui_light1, "bold" ], [ "qfSeparator", "Ignore" ], [ "qfError", "ErrorMsg" ], @@ -555,30 +558,30 @@ # ctrl-p highlighting # :h ctrlp-customization - [ "CtrlPPrtBase", gray6, gray3, "bold" ], - [ "CtrlPPrtText", gray6, gray0, "bold"], - [ "CtrlPMatch", "NONE", gray6, "bold"], - [ "CtrlPMode1", "NONE", gray7, "bold"], - [ "CtrlPMode2", "NONE", gray5, "NONE"], + [ "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"], [ "CtrlPNoEntries", "NONE", red_ui4, "bold" ], - [ "CtrlPBufferNr", "NONE", gray6, "bold" ], - [ "CtrlPBufferInd", "NONE", white, "bold" ], - [ "CtrlPBufferPath", "NONE", gray3, "NONE" ], - [ "CtrlPBufferHid", "NONE", gray4, "NONE" ], + [ "CtrlPBufferNr", "NONE", ui_light2, "bold" ], + [ "CtrlPBufferInd", "NONE", ui_light4, "bold" ], + [ "CtrlPBufferPath", "NONE", ui_dark2, "NONE" ], + [ "CtrlPBufferHid", "NONE", ui_fg, "NONE" ], [ "CtrlPBufferHidMod", "NONE", red_ui2, "NONE" ], [ "CtrlPBufferVis", "Normal" ], [ "CtrlPBufferVisMod", "NONE", red_ui3, "NONE" ], - [ "CtrlPBufferCur", "NONE", gray7, "bold" ], + [ "CtrlPBufferCur", "NONE", ui_light3, "bold" ], [ "CtrlPBufferCurMod", "NONE", red_ui4, "NONE" ], [ "CtrlPBufName", "NONE", red_ui4, "NONE" ], [ "CtrlPTagKind", "NONE", red_ui4, "bold" ], [ "CtrlPqfLineCol", "NONE", red_ui3, "bold" ], - [ "CtrlPUndoT", "NONE", gray5, "NONE" ], - [ "CtrlPUndoBr", "NONE", gray1, "NONE" ], - [ "CtrlPUndoNr", "NONE", gray2, "NONE" ], + [ "CtrlPUndoT", "NONE", ui_light1, "NONE" ], + [ "CtrlPUndoBr", "NONE", ui_dark1, "NONE" ], + [ "CtrlPUndoNr", "NONE", ui_dark2, "NONE" ], [ "CtrlPUndoSv", "NONE", red_ui3, "NONE" ], - [ "CtrlPUndoPo", "NONE", gray7, "bold" ], + [ "CtrlPUndoPo", "NONE", ui_light3, "bold" ], # i3config [ "Variable", "Function" ],