style(colors): make definitions more compact

The groups defined were tabularized to a fault. I think this undoes some
of that.
This commit is contained in:
Iron-E 2020-12-17 13:58:56 -05:00
parent 3bced25e47
commit 527245d736
No known key found for this signature in database
GPG Key ID: 19B71B7B7B021D22
1 changed files with 209 additions and 209 deletions

View File

@ -241,101 +241,101 @@ local highlight_group_normal = {fg=gray_light, bg=black}
-- This is where the rest of your highlights should go.
local highlight_groups = {
--[[ 4.1. Text Analysis ]]
Comment = {fg=gray, style='italic'},
NonText = {fg=gray_darker},
Comment = {fg=gray, style='italic'},
NonText = {fg=gray_darker},
EndOfBuffer = 'NonText',
Whitespace = 'NonText',
--[[ 4.1.1. Literals]]
Constant = {fg=orange_light},
String = {fg=green_dark},
Constant = {fg=orange_light},
String = {fg=green_dark},
Character = {fg=red_light},
Number = {fg=pink_light},
Boolean = {fg=yellow},
Float = 'Number',
Number = {fg=pink_light},
Boolean = {fg=yellow},
Float = 'Number',
--[[ 4.1.2. Identifiers]]
Identifier = {fg=FG},
Function = {fg=purple},
Function = {fg=purple},
--[[ 4.1.3. Syntax]]
Statement = {fg=ice},
Conditional = {fg=ice, style='italic'},
Repeat = {fg=turqoise, style='italic'},
Label = {fg=pink, style='bold'},
Operator = {fg=green, style='bold'},
Keyword = {fg=teal},
Exception = {fg=red_light, style='bold'},
Noise = 'Delimiter',
Conditional = {fg=ice, style='italic'},
Repeat = {fg=turqoise, style='italic'},
Label = {fg=pink, style='bold'},
Operator = {fg=green, style='bold'},
Keyword = {fg=teal},
Exception = {fg=red_light, style='bold'},
Noise = 'Delimiter',
--[[ 4.1.4. Metatextual Information]]
PreProc = {fg=tan},
Include = {fg=green_light, style='nocombine'},
Define = {fg=blue, style='nocombine'},
Macro = {fg=blue, style='italic'},
PreCondit = {fg=tan, style='italic'},
PreProc = {fg=tan},
Include = {fg=green_light, style='nocombine'},
Define = {fg=blue, style='nocombine'},
Macro = {fg=blue, style='italic'},
PreCondit = {fg=tan, style='italic'},
--[[ 4.1.5. Semantics]]
Type = {fg=cyan},
StorageClass = {fg=orange_light, style='bold'},
Structure = {fg=blue, style='bold'},
Typedef = {fg=cyan, style='italic'},
Structure = {fg=blue, style='bold'},
Typedef = {fg=cyan, style='italic'},
--[[ 4.1.6. Edge Cases]]
Special = {fg=magenta, style='bold'},
SpecialChar = {fg=red_light, style='italic'},
SpecialKey = 'Character',
Tag = 'Underlined',
Delimiter = {fg=white},
Special = {fg=magenta, style='bold'},
SpecialChar = {fg=red_light, style='italic'},
SpecialKey = 'Character',
Tag = 'Underlined',
Delimiter = {fg=white},
SpecialComment = {fg=gray, style={'bold', 'nocombine'}},
Debug = 'WarningMsg',
Debug = 'WarningMsg',
--[[ 4.1.7. Help Syntax]]
Underlined = {fg=turqoise, style='underline'},
Ignore = {fg=gray},
Error = {fg=white, bg=red_dark, style='bold'},
Todo = {fg=yellow, style={'bold', 'underline'}},
Underlined = {fg=turqoise, style='underline'},
Ignore = {fg=gray},
Error = {fg=white, bg=red_dark, style='bold'},
Todo = {fg=yellow, style={'bold', 'underline'}},
helpHyperTextJump = 'Underlined',
helpSpecial = 'Function',
Hint = {fg=black, bg=magenta, style='bold'},
Info = function(self) return {fg=self.Hint.fg, bg=pink_light, style=self.Hint.style} end,
Warning = function(self) return {fg=self.Hint.fg, bg=orange, style=self.Hint.style} end,
helpSpecial = 'Function',
Hint = {fg=black, bg=magenta, style='bold'},
Info = function(self) return {fg=self.Hint.fg, bg=pink_light, style=self.Hint.style} end,
Warning = function(self) return {fg=self.Hint.fg, bg=orange, style=self.Hint.style} end,
--[[ 4.2... Editor UI ]]
--[[ 4.2.1. Status Line]]
StatusLine = {fg=green_light, bg=gray_darker},
StatusLineNC = function(self) return {fg=gray, bg=self.StatusLine.bg} end,
StatusLineTerm = 'StatusLine',
StatusLine = {fg=green_light, bg=gray_darker},
StatusLineNC = function(self) return {fg=gray, bg=self.StatusLine.bg} end,
StatusLineTerm = 'StatusLine',
StatusLineTermNC = 'StatusLineNC',
--[[ 4.2.2. Separators]]
VertSplit = {fg=white},
TabLine = {fg=FG, bg=gray_darker},
VertSplit = {fg=white},
TabLine = {fg=FG, bg=gray_darker},
TabLineFill = {fg=gray_darker, bg=black},
TabLineSel = {fg=FG, bg=BG},
Title = {style='bold'},
TabLineSel = {fg=FG, bg=BG},
Title = {style='bold'},
--[[ 4.2.3. Conditional Line Highlighting]]
Conceal = 'NonText',
CursorLine = {bg=gray_dark},
CursorLineNr = function(self) return {fg=pink, bg=self.CursorLine.bg} end,
Conceal = 'NonText',
CursorLine = {bg=gray_dark},
CursorLineNr = function(self) return {fg=pink, bg=self.CursorLine.bg} end,
debugBreakpoint = 'ErrorMsg',
debugPC = 'ColorColumn',
LineNr = {fg=gray},
QuickFixLine = {bg=gray_darker},
Visual = {style='inverse'},
VisualNOS = {bg=gray_darker},
debugPC = 'ColorColumn',
LineNr = {fg=gray},
QuickFixLine = {bg=gray_darker},
Visual = {style='inverse'},
VisualNOS = {bg=gray_darker},
--[[ 4.2.4. Popup Menu]]
Pmenu = {fg=FG, bg=gray_dark},
PmenuSbar = {bg=black},
PmenuSel = {fg=FG},
Pmenu = {fg=FG, bg=gray_dark},
PmenuSbar = {bg=black},
PmenuSel = {fg=FG},
PmenuThumb = {bg=white},
WildMenu = 'PmenuSel',
WildMenu = 'PmenuSel',
--[[ 4.2.5. Folds]]
FoldColumn = {bg=gray_darker, style='bold'},
Folded = {fg=black, bg=purple_light, style='italic'},
Folded = {fg=black, bg=purple_light, style='italic'},
--[[ 4.2.6. Diffs]]
DiffAdd = {fg=black, bg=green_dark},
@ -345,8 +345,8 @@ local highlight_groups = {
--[[ 4.2.7. Searching]]
IncSearch = {style='inverse'},
Search = {style={'underline', color=white}},
MatchParen = {fg=green, style={'bold', 'underline'}},
Search = {style={'underline', color=white}},
--[[ 4.2.8. Spelling]]
SpellBad = {style={'undercurl', color=red}},
@ -359,11 +359,11 @@ local highlight_groups = {
SignColumn = NONE,
--[[ 4.2.10. Messages]]
ErrorMsg = {fg=red, style='bold'},
HintMsg = {fg=magenta, style='bold'},
InfoMsg = {fg=pink_light, style='bold'},
ModeMsg = {fg=yellow},
WarningMsg = {fg=orange, style='bold'},
ErrorMsg = {fg=red, style='bold'},
HintMsg = {fg=magenta, style='bold'},
InfoMsg = {fg=pink_light, style='bold'},
ModeMsg = {fg=yellow},
WarningMsg = {fg=orange, style='bold'},
Question = {fg=orange_light, style='underline'},
--[[ 4.2.11. LSP ]]
@ -410,39 +410,39 @@ local highlight_groups = {
cppSTLnamespace = 'String',
--[[ 4.3.3 C# ]]
csBraces = 'Delimiter',
csClass = 'Structure',
csClassType = 'Type',
csBraces = 'Delimiter',
csClass = 'Structure',
csClassType = 'Type',
csContextualStatement = 'Conditional',
csEndColon = 'Delimiter',
csGeneric = 'Typedef',
csEndColon = 'Delimiter',
csGeneric = 'Typedef',
csInterpolation = 'Include',
csInterpolationDelimiter = 'SpecialChar',
csLogicSymbols = 'Operator',
csModifier = 'Keyword',
csNew = 'Operator',
csNewType = 'Type',
csParens = 'Delimiter',
csModifier = 'Keyword',
csNew = 'Operator',
csNewType = 'Type',
csParens = 'Delimiter',
csPreCondit = 'PreProc',
csRepeat = 'Repeat',
csStorage = 'StorageClass',
csRepeat = 'Repeat',
csStorage = 'StorageClass',
csUnspecifiedStatement = 'Statement',
csXmlTag = 'Define',
csXmlTag = 'Define',
csXmlTagName = 'Define',
--[[ 4.3.4. CSS ]]
cssBraces = 'Delimiter',
cssProp = 'Keyword',
cssBraces = 'Delimiter',
cssProp = 'Keyword',
cssSelectorOp = 'Operator',
cssTagName = 'Type',
cssTagName = 'htmlTagName',
cssTagName = 'Type',
cssTagName = 'htmlTagName',
scssAmpersand = 'Special',
scssAttribute = 'Label',
scssBoolean = 'Boolean',
scssDefault = 'Keyword',
scssElse = 'PreCondit',
scssIf = 'PreCondit',
scssInclude = 'Include',
scssDefault = 'Keyword',
scssElse = 'PreCondit',
scssIf = 'PreCondit',
scssInclude = 'Include',
scssSelectorChar = 'Operator',
scssSelectorName = 'Identifier',
scssVariable = 'Define',
@ -456,43 +456,43 @@ local highlight_groups = {
dotType = 'Type',
--[[ 4.3.7. Go ]]
goBlock = 'Delimiter',
goBoolean = 'Boolean',
goBuiltins = 'Operator',
goField = 'Identifier',
goFloat = 'Float',
goFormatSpecifier = 'Character',
goFunction = 'Function',
goFunctionCall = 'goFunction',
goFunctionReturn = NONE,
goMethodCall = 'goFunctionCall',
goParamType = 'goReceiverType',
goPointerOperator = 'SpecialChar',
goBlock = 'Delimiter',
goBoolean = 'Boolean',
goBuiltins = 'Operator',
goField = 'Identifier',
goFloat = 'Float',
goFormatSpecifier = 'Character',
goFunction = 'Function',
goFunctionCall = 'goFunction',
goFunctionReturn = NONE,
goMethodCall = 'goFunctionCall',
goParamType = 'goReceiverType',
goPointerOperator = 'SpecialChar',
goPredefinedIdentifiers = 'Constant',
goReceiver = 'goBlock',
goReceiverType = 'goTypeName',
goSimpleParams = 'goBlock',
goType = 'Type',
goTypeConstructor = 'goFunction',
goTypeName = 'Type',
goVarAssign = 'Identifier',
goVarDefs = 'goVarAssign',
goReceiver = 'goBlock',
goReceiverType = 'goTypeName',
goSimpleParams = 'goBlock',
goType = 'Type',
goTypeConstructor = 'goFunction',
goTypeName = 'Type',
goVarAssign = 'Identifier',
goVarDefs = 'goVarAssign',
--[[ 4.3.8. HTML ]]
htmlArg = 'Label',
htmlBold = {fg=gray_light, style='bold'},
htmlTitle = 'htmlBold',
htmlEndTag = 'htmlTag',
htmlH1 = 'markdownH1',
htmlH2 = 'markdownH2',
htmlH3 = 'markdownH3',
htmlH4 = 'markdownH4',
htmlH5 = 'markdownH5',
htmlH6 = 'markdownH6',
htmlArg = 'Label',
htmlBold = {fg=gray_light, style='bold'},
htmlTitle = 'htmlBold',
htmlEndTag = 'htmlTag',
htmlH1 = 'markdownH1',
htmlH2 = 'markdownH2',
htmlH3 = 'markdownH3',
htmlH4 = 'markdownH4',
htmlH5 = 'markdownH5',
htmlH6 = 'markdownH6',
htmlItalic = {style='italic'},
htmlSpecialTagName = 'Keyword',
htmlTag = 'Special',
htmlTagN = 'Typedef',
htmlTag = 'Special',
htmlTagN = 'Typedef',
htmlTagName = 'Type',
--[[ 4.3.9. Java ]]
@ -514,17 +514,17 @@ local highlight_groups = {
jsonStringSQError = 'Exception',
--[[ 4.3.12. Lua ]]
luaBraces = 'Structure',
luaBrackets = 'Delimiter',
luaBuiltin = 'Keyword',
luaComma = 'Delimiter',
luaFuncArgName = 'Identifier',
luaFuncCall = 'Function',
luaFuncId = 'luaNoise',
luaFuncKeyword = 'Type',
luaFuncName = 'Function',
luaFuncParens = 'Delimiter',
luaFuncTable = 'Structure',
luaBraces = 'Structure',
luaBrackets = 'Delimiter',
luaBuiltin = 'Keyword',
luaComma = 'Delimiter',
luaFuncArgName = 'Identifier',
luaFuncCall = 'Function',
luaFuncId = 'luaNoise',
luaFuncKeyword = 'Type',
luaFuncName = 'Function',
luaFuncParens = 'Delimiter',
luaFuncTable = 'Structure',
luaIn = 'luaRepeat',
luaLocal = 'Type',
luaNoise = 'Operator',
@ -537,74 +537,74 @@ local highlight_groups = {
makeSpecTarget = 'Type',
--[[ 4.3.13. Markdown ]]
markdownH1 = {fg=red, style='bold'},
markdownH2 = {fg=orange, style='bold'},
markdownH3 = {fg=yellow, style='bold'},
markdownH4 = {fg=green_dark, style='bold'},
markdownH5 = {fg=cyan, style='bold'},
markdownH6 = {fg=purple_light, style='bold'},
mkdBold = 'SpecialComment',
mkdCode = 'Keyword',
mkdCodeDelimiter = 'mkdBold',
mkdCodeStart = 'mkdCodeDelimiter',
mkdCodeEnd = 'mkdCodeStart',
mkdHeading = 'Delimiter',
mkdItalic = 'mkdBold',
mkdLineBreak = NONE,
mkdListItem = 'Special',
mkdRule = 'Underlined',
markdownH1 = {fg=red, style='bold'},
markdownH2 = {fg=orange, style='bold'},
markdownH3 = {fg=yellow, style='bold'},
markdownH4 = {fg=green_dark, style='bold'},
markdownH5 = {fg=cyan, style='bold'},
markdownH6 = {fg=purple_light, style='bold'},
mkdBold = 'SpecialComment',
mkdCode = 'Keyword',
mkdCodeDelimiter = 'mkdBold',
mkdCodeStart = 'mkdCodeDelimiter',
mkdCodeEnd = 'mkdCodeStart',
mkdHeading = 'Delimiter',
mkdItalic = 'mkdBold',
mkdLineBreak = NONE,
mkdListItem = 'Special',
mkdRule = 'Underlined',
--[[ 4.3.20. Python ]]
pythonBrackets = 'Delimiter',
pythonBuiltinFunc = 'Operator',
pythonBuiltinObj = 'Type',
pythonBuiltinType = 'Type',
pythonClass = 'Structure',
pythonBrackets = 'Delimiter',
pythonBuiltinFunc = 'Operator',
pythonBuiltinObj = 'Type',
pythonBuiltinType = 'Type',
pythonClass = 'Structure',
pythonClassParameters = 'pythonParameters',
pythonDecorator = 'PreProc',
pythonDottedName = 'Identifier',
pythonError = 'Error',
pythonException = 'Exception',
pythonInclude = 'Include',
pythonIndentError = 'pythonError',
pythonLambdaExpr = 'pythonOperator',
pythonOperator = 'Operator',
pythonParam = 'Identifier',
pythonParameters = 'Delimiter',
pythonSelf = 'Statement',
pythonSpaceError = 'pythonError',
pythonStatement = 'Statement',
pythonDecorator = 'PreProc',
pythonDottedName = 'Identifier',
pythonError = 'Error',
pythonException = 'Exception',
pythonInclude = 'Include',
pythonIndentError = 'pythonError',
pythonLambdaExpr = 'pythonOperator',
pythonOperator = 'Operator',
pythonParam = 'Identifier',
pythonParameters = 'Delimiter',
pythonSelf = 'Statement',
pythonSpaceError = 'pythonError',
pythonStatement = 'Statement',
--[[ 4.3.21. Ruby ]]
rubyClass = 'Structure',
rubyDefine = 'Define',
rubyClass = 'Structure',
rubyDefine = 'Define',
rubyInterpolationDelimiter = 'Delimiter',
--[[ 4.3.22. Rust ]]
rustConstraint = 'Operator',
rustFieldName = 'Label',
rustFieldSep = 'Delimiter',
rustGeneric = 'Delimiter',
rustFieldName = 'Label',
rustFieldSep = 'Delimiter',
rustGeneric = 'Delimiter',
rustIdentifier = 'Identifier',
rustKeyword = 'Keyword',
rustModPath = 'Include',
rustNoise = 'Delimiter',
rustPanic = 'Exception',
rustRepeat = 'Repeat',
rustScopeDecl = 'Delimiter',
rustStructure = 'Structure',
rustKeyword = 'Keyword',
rustModPath = 'Include',
rustNoise = 'Delimiter',
rustPanic = 'Exception',
rustRepeat = 'Repeat',
rustScopeDecl = 'Delimiter',
rustStructure = 'Structure',
--[[ 4.3.23. Scala ]]
scalaKeyword = 'Keyword',
scalaKeyword = 'Keyword',
scalaNameDefinition = 'Identifier',
--[[ 4.3.24. shell ]]
shDerefSimple = 'SpecialChar',
shFunctionKey = 'Function',
shLoop = 'Repeat',
shParen = 'Delimiter',
shQuote = 'Delimiter',
shSet = 'Statement',
shLoop = 'Repeat',
shParen = 'Delimiter',
shQuote = 'Delimiter',
shSet = 'Statement',
shTestOpr = 'Debug',
--[[ 4.3.25. Solidity ]]
@ -614,41 +614,41 @@ local highlight_groups = {
--[[ 4.3.26. TOML ]]
tomlComment = 'Comment',
tomlKey = 'Label',
tomlTable = 'Structure',
tomlKey = 'Label',
tomlTable = 'Structure',
--[[ 4.3.27. VimScript ]]
helpSpecial = 'Special',
helpHeader = 'Label',
helpHeadline = 'Title',
helpSpecial = 'Special',
helpHeader = 'Label',
helpHeadline = 'Title',
helpSectionDelim = 'Delimiter',
vimCmdSep = 'Delimiter',
vimFunction = 'Function',
vimFgBgAttrib = 'Constant',
vimHiCterm = 'Label',
vimCmdSep = 'Delimiter',
vimFunction = 'Function',
vimFgBgAttrib = 'Constant',
vimHiCterm = 'Label',
vimHiCtermFgBg = 'vimHiCterm',
vimHiGroup = 'Typedef',
vimHiGui = 'vimHiCterm',
vimHiGuiFgBg = 'vimHiGui',
vimHiKeyList = 'Operator',
vimIsCommand = 'Identifier',
vimOption = 'Keyword',
vimHiGroup = 'Typedef',
vimHiGui = 'vimHiCterm',
vimHiGuiFgBg = 'vimHiGui',
vimHiKeyList = 'Operator',
vimIsCommand = 'Identifier',
vimOption = 'Keyword',
vimScriptDelim = 'Ignore',
vimSet = 'String',
vimSetEqual = 'Operator',
vimSetSep = 'Delimiter',
vimSet = 'String',
vimSetEqual = 'Operator',
vimSetSep = 'Delimiter',
--[[ 4.3.28. XML ]]
xmlAttrib = 'htmlArg',
xmlEndTag = 'xmlTag',
xmlEqual = 'Operator',
xmlTag = 'htmlTag',
xmlAttrib = 'htmlArg',
xmlEndTag = 'xmlTag',
xmlEqual = 'Operator',
xmlTag = 'htmlTag',
xmlTagName = 'htmlTagName',
--[[ 4.3.29. SQL ]]
sqlKeyword = 'Keyword',
sqlParen = 'Delimiter',
sqlSpecial = 'Constant',
sqlKeyword = 'Keyword',
sqlParen = 'Delimiter',
sqlSpecial = 'Constant',
sqlStatement = 'Statement',
sqlParenFunc = 'Function',
@ -672,8 +672,8 @@ local highlight_groups = {
gitcommitOverFlow = 'Error',
gitcommitSummary = 'Title',
gitconfigAssignment = 'String',
gitconfigNone = 'Oprator',
gitrebaseBreak = 'Keyword',
gitconfigNone = 'Oprator',
gitrebaseBreak = 'Keyword',
gitrebaseCommit = 'Tag',
gitrebaseDrop = 'Exception',
gitrebaseEdit = 'Define',
@ -687,9 +687,9 @@ local highlight_groups = {
gitrebaseSummary = 'Title',
--[[ 4.3.35. Vimtex ]]
texMathRegion = 'Number',
texMathSub = 'Number',
texMathSuper = 'Number',
texMathRegion = 'Number',
texMathSub = 'Number',
texMathSuper = 'Number',
texMathRegionX = 'Number',
texMathRegionXX = 'Number',
@ -736,9 +736,9 @@ local highlight_groups = {
JumpMotion = 'EasyMotion',
--[[ 4.4.4. vim-gitgutter / vim-signify ]]
GitGutterAdd = {fg=green},
GitGutterChange = {fg=yellow},
GitGutterDelete = {fg=red},
GitGutterAdd = {fg = green},
GitGutterChange = {fg = yellow},
GitGutterDelete = {fg = red},
GitGutterChangeDelete = {fg=orange},
SignifySignAdd = 'GitGutterAdd',