diff --git a/vim/colors/monotonous2.erb b/vim/colors/monotonous2.erb index 6c5bf77..c16c70d 100644 --- a/vim/colors/monotonous2.erb +++ b/vim/colors/monotonous2.erb @@ -76,27 +76,38 @@ gray7 = ["#adaeae", 250, "white"] white = ["#eeeeee", 255, "white"] - error = ["#c74444", 196, "red"] - warning = ["#a67038", 166, "yellow"] + grayTMP = ["#5c5d5d", 240, "gray"] # need red, green , blue, etc colors for syntax - lightred1 = ["#b79392", 174, "darkgray"] - lightred2 = ["#ac807e", 181, "darkgray"] - lightred3 = ["#b79392", 188, "white"] + grayred0 = ["#373030", 52, "darkred"] + grayred3 = ["#6b5d5d", 52, "darkred"] + red1 = ["#866b6b", 52, "darkred"] + red2 = ["#967978", 52, "darkred"] + red3 = ["#a78685", 88, "darkred"] + red4 = ["#b79392", 88, "darkred"] + red5 = ["#c4a6a5", 88, "darkred"] + red6 = ["#cab0af", 124, "darkred"] + red7 = ["#d1bab9", 124, "darkred"] # UI Colours + red_bg = ["#463838", 52, "darkred"] red_ui1 = ["#655757", 124, "red"] red_ui2 = ["#7b6a6a", 124, "red"] red_ui3 = ["#938585", 124, "red"] green_ui1 = ["#515b51", 34, "green"] green_ui2 = ["#626e62", 34, "green"] green_ui3 = ["#7e887e", 34, "green"] + blue_bg0 = ["#384046", 17, "darkblue"] blue_bg1 = ["#49535a", 17, "darkblue"] blue_bg2 = ["#93adc2", 17, "darkblue"] blue_ui1 = ["#62626c", 19, "blue"] blue_ui2 = ["#777783", 19, "blue"] blue_ui3 = ["#9090a5", 19, "blue"] + error = ["#c74444", 196, "red"] + warning = ["#a67038", 166, "yellow"] + info = ["#797532", 166, "yellow"] + # Step 3: highlights # @@ -136,70 +147,103 @@ [ "Normal", gray_bg, gray_fg, "NONE" ], [ "NonText", "NONE", "NONE", "NONE" ], - [ "Special", "NONE", white, "NONE" ], - [ "Identifier", "NONE", white, "NONE" ], - [ "Type", "NONE", white, "NONE" ], + [ "Special", "NONE", red6, "bold" ], + [ "Tag", grayred0, "NONE", "NONE" ], + + [ "Identifier", "NONE", red4, "NONE" ], + [ "Function", "NONE", red5, "bold" ], + + [ "Type", "NONE", red2, "NONE" ], + [ "StorageClass", "NONE", red1, "bold" ], + [ "Structure", "StorageClass"], + [ "TypeDef", "StorageClass"], [ "Constant", "NONE", white, "italic" ], - [ "String", "NONE", gray6, "italic" ], - [ "Number", "NONE", gray6, "italic" ], - - [ "PreProc", "NONE", white, "NONE" ], + [ "String", "NONE", gray7, "italic" ], + [ "Character", "String" ], + [ "Number", "String" ], + [ "Boolean", "String" ], + [ "Float", "String" ], [ "Folded", "NONE", gray7, "NONE" ], - [ "Statement", "NONE", gray3, "NONE" ], + [ "Statement", "NONE", gray_fg, "NONE" ], + [ "Conditional", "NONE", gray6, "bold" ], + [ "Repeat", "NONE", gray6, "bold" ], + [ "Label", "NONE", gray5, "bold" ], + [ "Operator", "NONE", gray3, "bold" ], + [ "Keyword", "NONE", gray7, "bold" ], + [ "Exception", "NONE", grayred3, "bold" ], + + [ "PreProc", "NONE", gray2, "bold" ], + [ "Include", "NONE", gray2, "NONE" ], [ "Comment", "NONE", gray3, "italic" ], + [ "SpecialComment", "NONE", gray5, "italic"], [ "Todo", "NONE", gray6, "italic" ], - [ "Ignore", "NONE", white, "NONE" ], + [ "Ignore", "NONE", gray_bg, "NONE" ], [ "Error", "NONE", error, "bold" ], - [ "Underlined", gray, white, "NONE" ], + [ "Underlined", "NONE", "NONE", "underline" ], + [ "StatusLine", gray_deco, gray7, "NONE" ], [ "StatusLineNC", gray_deco, gray4, "NONE" ], [ "VertSplit", gray_bg, gray_bg, "NONE" ], [ "TabLine", gray_deco, gray4, "NONE" ], [ "TabLineFill", gray_deco, gray_deco, "NONE" ], [ "TabLineSel", gray_deco, gray7, "NONE" ], - [ "Title", gray, white, "NONE" ], + + [ "Title", "NONE", grayTMP, "NONE" ], + [ "CursorLine", colorcolumn, "NONE", "NONE" ], [ "LineNr", gray_bg, gray3, "NONE" ], [ "CursorLineNr", gray_bg, gray5, "NONE" ], - [ "helpLeadBlank", gray, white, "NONE" ], - [ "helpNormal", gray, white, "NONE" ], - [ "Visual", gray, white, "NONE" ], - [ "VisualNOS", gray, white, "NONE" ], - [ "Pmenu", gray, white, "NONE" ], - [ "PmenuSbar", gray, white, "NONE" ], - [ "PmenuSel", gray, white, "NONE" ], - [ "PmenuThumb", gray, white, "NONE" ], + + [ "helpLeadBlank", "NONE", grayTMP, "NONE" ], + [ "helpNormal", "NONE", grayTMP, "NONE" ], + + [ "Pmenu", "NONE", grayTMP, "NONE" ], + [ "PmenuSbar", "NONE", grayTMP, "NONE" ], + [ "PmenuSel", "NONE", grayTMP, "NONE" ], + [ "PmenuThumb", "NONE", grayTMP, "NONE" ], + [ "FoldColumn", gray_deco, gray4, "NONE" ], - [ "WildMenu", gray, white, "NONE" ], - [ "SpecialKey", gray, white, "NONE" ], - [ "DiffAdd", gray, white, "NONE" ], - [ "DiffChange", gray, white, "NONE" ], - [ "DiffDelete", gray, white, "NONE" ], - [ "DiffText", gray, white, "NONE" ], + [ "ColorColumn", colorcolumn, "NONE", "NONE" ], + [ "SignColumn", gray_bg, gray7, "NONE" ], + + [ "SpecialKey", "NONE", grayTMP, "NONE" ], + + [ "DiffAdd", "NONE", grayTMP, "NONE" ], + [ "DiffChange", "NONE", grayTMP, "NONE" ], + [ "DiffDelete", "NONE", grayTMP, "NONE" ], + [ "DiffText", "NONE", grayTMP, "NONE" ], + [ "IncSearch", blue_bg2, gray_bg, "NONE" ], [ "Search", blue_bg1, gray7, "NONE" ], - [ "Directory", gray, white, "NONE" ], - [ "MatchParen", gray, white, "NONE" ], + + [ "Visual", blue_bg0, "NONE", "NONE" ], + [ "VisualNOS", red_bg, "NONE", "NONE" ], + + [ "Directory", "NONE", grayTMP, "NONE" ], + + [ "MatchParen", white, black, "bold" ], + [ "SpellBad", "NONE", error, "NONE", error ], [ "SpellCap", "NONE", warning, "NONE", warning ], - [ "SpellLocal", "NONE", warning, "NONE", warning ], - [ "SpellRare", "NONE", warning, "NONE", warning ], - [ "ColorColumn", colorcolumn, "NONE", "NONE" ], - [ "signColumn", gray_bg, white, "NONE" ], - [ "ErrorMsg", gray, white, "NONE" ], - [ "ModeMsg", gray, white, "NONE" ], - [ "MoreMsg", gray, white, "NONE" ], - [ "Question", gray, white, "NONE" ], - [ "WarningMsg", gray, white, "NONE" ], - [ "Cursor", gray, white, "NONE" ], - [ "CursorColumn", gray, white, "NONE" ] + [ "SpellLocal", "NONE", info, "NONE", warning ], + [ "SpellRare", "NONE", info, "NONE", warning ], + + [ "WildMenu", "NONE", grayTMP, "NONE" ], + [ "ErrorMsg", "NONE", error, "bold" ], + [ "ModeMsg", "NONE", white, "bold" ], + [ "MoreMsg", "NONE", grayTMP, "NONE" ], + [ "Question", "NONE", info, "NONE" ], + [ "WarningMsg", "NONE", warning, "bold" ], + + [ "Cursor", "NONE", grayTMP, "NONE" ], + [ "CursorColumn", "NONE", grayTMP, "NONE" ] ] # Step 4: generation