rayelliott
/
paper-tonic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'chore/none-cleanup' into integration

This commit is contained in:
Iron_E 2020-09-05 13:02:59 -04:00
parent 0300352b3e 49d520265e
commit 0c5e427953
No known key found for this signature in database
GPG Key ID: B0B37DE7EDC2335F
1 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
colors/highlite.vim
View File

@ -183,73 +183,73 @@ local purple_light = {'#af60af', 63, 'magenta'}
]] ]]
--[[ DO NOT EDIT `BG`, `FG`, or `NONE`. --[[ DO NOT EDIT `BG`, `FG`, or `NONE`.
Feel free to uncomment `BG`. It is not used by default so it is commented out. Feel free to uncomment `BG` and `NONE`. They are not used by default so they are commented out.
]] ]]
-- local BG = 'bg' -- local BG = 'bg'
local FG = 'fg' local FG = 'fg'
local NONE = 'NONE' -- local NONE = 'NONE'
--[[ These are the ones you should edit. ]] --[[ These are the ones you should edit. ]]
-- This is the only highlight that must be defined separately. -- This is the only highlight that must be defined separately.
local highlight_group_normal = {bg=black, fg=gray_light, style=NONE} local highlight_group_normal = {bg=black, fg=gray_light}
-- This is where the rest of your highlights should go. -- This is where the rest of your highlights should go.
local highlight_groups = { local highlight_groups = {
--[[ 4.1. Text Analysis ]] --[[ 4.1. Text Analysis ]]
Comment = {bg=NONE, fg=gray, style='italic'}, Comment = {fg=gray, style='italic'},
NonText = {fg=gray_darker},
EndOfBuffer = 'NonText', EndOfBuffer = 'NonText',
NonText = {bg=NONE, fg=gray_darker, style=NONE},
Whitespace = 'NonText', Whitespace = 'NonText',
--[[ 4.1.1. Literals]] --[[ 4.1.1. Literals]]
Constant = {bg=NONE, fg=orange_light, style=NONE}, Constant = {fg=orange_light},
String = {bg=NONE, fg=green, style=NONE}, String = {fg=green},
Character = {bg=NONE, fg=red_light, style=NONE}, Character = {fg=red_light},
Number = {bg=NONE, fg=pink_light, style=NONE}, Number = {fg=pink_light},
Boolean = {bg=NONE, fg=yellow, style=NONE}, Boolean = {fg=yellow},
Float = 'Number', Float = 'Number',
--[[ 4.1.2. Identifiers]] --[[ 4.1.2. Identifiers]]
Identifier = {bg=NONE, fg=FG, style=NONE}, Identifier = {fg=FG},
Function = {bg=NONE, fg=purple, style=NONE}, Function = {fg=purple},
--[[ 4.1.3. Syntax]] --[[ 4.1.3. Syntax]]
Statement = {bg=NONE, fg=ice, style=NONE }, Statement = {fg=ice},
Conditional = {bg=NONE, fg=ice, style='italic'}, Conditional = {fg=ice, style='italic'},
Repeat = {bg=NONE, fg=turqoise, style='bold' }, Repeat = {fg=turqoise, style='bold'},
Label = {bg=NONE, fg=pink, style='italic'}, Label = {fg=pink, style='italic'},
Operator = {bg=NONE, fg=green_dark, style=NONE }, Operator = {fg=green_dark},
Keyword = {bg=NONE, fg=teal, style=NONE }, Keyword = {fg=teal},
Exception = {bg=NONE, fg=red_light, style='bold' }, Exception = {fg=red_light, style='bold'},
Noise = 'Delimiter', Noise = 'Delimiter',
--[[ 4.1.4. Metatextual Information]] --[[ 4.1.4. Metatextual Information]]
PreProc = {bg=NONE, fg=tan, style=NONE }, PreProc = {fg=tan},
Include = {bg=NONE, fg=green_light, style='nocombine'}, Include = {fg=green_light, style='nocombine'},
Define = {bg=NONE, fg=blue, style='nocombine'}, Define = {fg=blue, style='nocombine'},
Macro = {bg=NONE, fg=blue, style='italic' }, Macro = {fg=blue, style='italic'},
PreCondit = {bg=NONE, fg=tan, style='italic' }, PreCondit = {fg=tan, style='italic'},
--[[ 4.1.5. Semantics]] --[[ 4.1.5. Semantics]]
Type = {bg=NONE, fg=cyan, style=NONE }, Type = {fg=cyan},
StorageClass = {bg=NONE, fg=orange_light, style='bold' }, StorageClass = {fg=orange_light, style='bold'},
Structure = {bg=NONE, fg=blue, style='bold' }, Structure = {fg=blue, style='bold'},
Typedef = {bg=NONE, fg=cyan, style='italic'}, Typedef = {fg=cyan, style='italic'},
--[[ 4.1.6. Edge Cases]] --[[ 4.1.6. Edge Cases]]
Special = {bg=NONE, fg=magenta, style='bold'}, Special = {fg=magenta, style='bold'},
SpecialChar = {bg=NONE, fg=red_light, style='italic'}, SpecialChar = {fg=red_light, style='italic'},
SpecialKey = 'Character', SpecialKey = 'Character',
Tag = 'Underlined', Tag = 'Underlined',
Delimiter = {bg=NONE, fg=white, style=NONE}, Delimiter = {fg=white},
SpecialComment = {bg=NONE, fg=gray, style={'bold', 'nocombine'}}, SpecialComment = {fg=gray, style={'bold', 'nocombine'}},
Debug = 'WarningMsg', Debug = 'WarningMsg',
--[[ 4.1.7. Help Syntax]] --[[ 4.1.7. Help Syntax]]
Underlined = {bg=NONE, fg=turqoise, style='underline'}, Underlined = {fg=turqoise, style='underline'},
Ignore = {bg=NONE, fg=gray, style=NONE }, Ignore = {fg=gray},
Error = {bg=red_dark, fg=white, style='bold'}, Error = {bg=red_dark, fg=white, style='bold'},
Todo = {bg=NONE, fg=yellow, style={'bold', 'underline'}}, Todo = {fg=yellow, style={'bold', 'underline'}},
helpHyperTextJump = 'Underlined', helpHyperTextJump = 'Underlined',
helpSpecial = 'Function', helpSpecial = 'Function',
Hint = {bg=magenta, fg=black, style='bold'}, Hint = {bg=magenta, fg=black, style='bold'},
@ -258,68 +258,68 @@ local highlight_groups = {
--[[ 4.2... Editor UI ]] --[[ 4.2... Editor UI ]]
--[[ 4.2.1. Status Line]] --[[ 4.2.1. Status Line]]
StatusLine = {bg=gray_darker, fg=green_light, style=NONE}, StatusLine = {bg=gray_darker, fg=green_light},
StatusLineNC = {bg=gray_darker, fg=gray, style=NONE}, StatusLineNC = {bg=gray_darker, fg=gray},
StatusLineTerm = 'StatusLine', StatusLineTerm = 'StatusLine',
StatusLineTermNC = 'StatusLineNC', StatusLineTermNC = 'StatusLineNC',
--[[ 4.2.2. Separators]] --[[ 4.2.2. Separators]]
VertSplit = {bg=NONE, fg=gray_darker, style=NONE}, VertSplit = {fg=gray_darker},
TabLine = {bg=gray_darker, fg=FG, style=NONE}, TabLine = {bg=gray_darker, fg=FG},
TabLineFill = {bg=NONE, fg=FG, style=NONE}, TabLineFill = {fg=FG},
TabLineSel = {bg=gray_darker, fg=FG, style='inverse'}, TabLineSel = {bg=gray_darker, fg=FG, style='inverse'},
Title = {bg=NONE, fg=NONE, style='bold' }, Title = {style='bold'},
--[[ 4.2.3. Conditional Line Highlighting]] --[[ 4.2.3. Conditional Line Highlighting]]
--Conceal={} --Conceal={}
CursorLine = {bg=gray_dark, fg=NONE, style=NONE}, CursorLine = {bg=gray_dark},
CursorLineNr = {bg=gray_dark, fg=pink, style=NONE}, CursorLineNr = {bg=gray_dark, fg=pink},
debugBreakpoint = 'ErrorMsg', debugBreakpoint = 'ErrorMsg',
debugPC = 'ColorColumn', debugPC = 'ColorColumn',
LineNr = {bg=NONE, fg=gray, style=NONE}, LineNr = {fg=gray},
QuickFixLine = {bg=gray_darker, fg=NONE, style=NONE}, QuickFixLine = {bg=gray_darker},
Visual = {bg=NONE, fg=NONE, style='inverse'}, Visual = {style='inverse'},
VisualNOS = {bg=gray_darker, fg=NONE, style=NONE}, VisualNOS = {bg=gray_darker},
--[[ 4.2.4. Popup Menu]] --[[ 4.2.4. Popup Menu]]
Pmenu = {bg=gray_dark, fg=FG, style=NONE}, Pmenu = {bg=gray_dark, fg=FG},
PmenuSbar = {bg=black, fg=NONE, style=NONE}, PmenuSbar = {bg=black},
PmenuSel = {bg=NONE, fg=FG, style=NONE}, PmenuSel = {fg=FG},
PmenuThumb = {bg=white, fg=NONE, style=NONE}, PmenuThumb = {bg=white},
WildMenu = {bg=NONE, fg=NONE, style=NONE}, WildMenu = {},
--[[ 4.2.5. Folds]] --[[ 4.2.5. Folds]]
FoldColumn = {bg=gray_darker, fg=NONE, style='bold' }, FoldColumn = {bg=gray_darker, style='bold'},
Folded = {bg=purple_light, fg=black, style='italic'}, Folded = {bg=purple_light, fg=black, style='italic'},
--[[ 4.2.6. Diffs]] --[[ 4.2.6. Diffs]]
DiffAdd = {bg=NONE, fg=green_dark, style='inverse'}, DiffAdd = {fg=green_dark, style='inverse'},
DiffChange = {bg=NONE, fg=yellow, style='inverse'}, DiffChange = {fg=yellow, style='inverse'},
DiffDelete = {bg=NONE, fg=red, style='inverse'}, DiffDelete = {fg=red, style='inverse'},
DiffText = {bg=NONE, fg=NONE, style='inverse'}, DiffText = {style='inverse'},
--[[ 4.2.7. Searching]] --[[ 4.2.7. Searching]]
IncSearch = {bg=NONE, fg=NONE, style='inverse'}, IncSearch = {style='inverse'},
Search = {bg=NONE, fg=NONE, style={'underline', color=white}}, Search = {style={'underline', color=white}},
MatchParen = {bg=NONE, fg=green, style={'bold', 'underline' }}, MatchParen = {fg=green, style={'bold', 'underline'}},
--[[ 4.2.8. Spelling]] --[[ 4.2.8. Spelling]]
SpellBad = {bg=NONE, fg=NONE, style={'undercurl', color=red }}, SpellBad = {style={'undercurl', color=red}},
SpellCap = {bg=NONE, fg=NONE, style={'undercurl', color=yellow}}, SpellCap = {style={'undercurl', color=yellow}},
SpellLocal = {bg=NONE, fg=NONE, style={'undercurl', color=green }}, SpellLocal = {style={'undercurl', color=green}},
SpellRare = {bg=NONE, fg=NONE, style={'undercurl', color=orange}}, SpellRare = {style={'undercurl', color=orange}},
--[[ 4.2.9. Conditional Column Highlighting]] --[[ 4.2.9. Conditional Column Highlighting]]
ColorColumn = {bg=NONE, fg=NONE, style='inverse'}, ColorColumn = {style='inverse'},
SignColumn = {bg=NONE, fg=NONE, style=NONE}, SignColumn = {},
--[[ 4.2.10. Messages]] --[[ 4.2.10. Messages]]
ErrorMsg = {bg=NONE, fg=red, style='bold'}, ErrorMsg = {fg=red, style='bold'},
HintMsg = {bg=NONE, fg=magenta, style='bold'}, HintMsg = {fg=magenta, style='bold'},
InfoMsg = {bg=NONE, fg=pink_light, style='bold'}, InfoMsg = {fg=pink_light, style='bold'},
ModeMsg = {bg=NONE, fg=yellow, style=NONE }, ModeMsg = {fg=yellow},
WarningMsg = {bg=NONE, fg=orange, style='bold'}, WarningMsg = {fg=orange, style='bold'},
Question = {bg=NONE, fg=orange_light, style='underline'}, Question = {fg=orange_light, style='underline'},
--[[ 4.2.11. LSP ]] --[[ 4.2.11. LSP ]]
LspDiagnosticsError = 'Error', LspDiagnosticsError = 'Error',
@ -338,19 +338,19 @@ local highlight_groups = {
LspDiagnosticsInformationFloating = 'InfoMsg', LspDiagnosticsInformationFloating = 'InfoMsg',
LspDiagnosticsInformationSign = 'InfoMsg', LspDiagnosticsInformationSign = 'InfoMsg',
LspDiagnosticsUnderline = {bg=NONE, fg=NONE, style={'undercurl', color=white}}, LspDiagnosticsUnderline = {style={'undercurl', color=white}},
LspDiagnosticsUnderlineError = 'CocErrorHighlight', LspDiagnosticsUnderlineError = 'CocErrorHighlight',
LspDiagnosticsUnderlineHint = 'CocHintHighlight', LspDiagnosticsUnderlineHint = 'CocHintHighlight',
LspDiagnosticsUnderlineInfo = 'CocInfoHighlight', LspDiagnosticsUnderlineInfo = 'CocInfoHighlight',
LspDiagnosticsUnderlineWarning = 'CocWarningHighlight', LspDiagnosticsUnderlineWarning = 'CocWarningHighlight',
--[[ 4.2.12. Cursor ]] --[[ 4.2.12. Cursor ]]
Cursor = {bg=NONE, fg=NONE, style='inverse'}, Cursor = {style='inverse'},
CursorIM = 'Cursor', CursorIM = 'Cursor',
CursorColumn = {bg=gray_dark, fg=NONE, style=NONE }, CursorColumn = {bg=gray_dark},
--[[ 4.2.13. Misc ]] --[[ 4.2.13. Misc ]]
Directory = {bg=NONE, fg=ice, style='bold'}, Directory = {fg=ice, style='bold'},
Terminal = 'Normal', Terminal = 'Normal',
--[[ 4.3. Programming Languages --[[ 4.3. Programming Languages
@ -421,7 +421,7 @@ local highlight_groups = {
goFormatSpecifier = 'Character', goFormatSpecifier = 'Character',
goFunction = 'Function', goFunction = 'Function',
goFunctionCall = 'goFunction', goFunctionCall = 'goFunction',
goFunctionReturn = {bg=NONE, fg=NONE, style=NONE}, goFunctionReturn = {},
goMethodCall = 'goFunctionCall', goMethodCall = 'goFunctionCall',
goParamType = 'goReceiverType', goParamType = 'goReceiverType',
goPointerOperator = 'SpecialChar', goPointerOperator = 'SpecialChar',
@ -437,7 +437,7 @@ local highlight_groups = {
--[[ 4.3.8. HTML ]] --[[ 4.3.8. HTML ]]
htmlArg = 'Label', htmlArg = 'Label',
htmlBold = {bg=NONE, fg=gray_light, style='bold'}, htmlBold = {fg=gray_light, style='bold'},
htmlTitle = 'htmlBold', htmlTitle = 'htmlBold',
htmlEndTag = 'htmlTag', htmlEndTag = 'htmlTag',
htmlH1 = 'markdownH1', htmlH1 = 'markdownH1',
@ -446,7 +446,7 @@ local highlight_groups = {
htmlH4 = 'markdownH4', htmlH4 = 'markdownH4',
htmlH5 = 'markdownH5', htmlH5 = 'markdownH5',
htmlH6 = 'markdownH6', htmlH6 = 'markdownH6',
htmlItalic = {bg=NONE, fg=NONE, style='italic'}, htmlItalic = {style='italic'},
htmlSpecialTagName = 'Keyword', htmlSpecialTagName = 'Keyword',
htmlTag = 'Special', htmlTag = 'Special',
htmlTagN = 'Typedef', htmlTagN = 'Typedef',
@ -492,12 +492,12 @@ local highlight_groups = {
makeSpecTarget = 'Type', makeSpecTarget = 'Type',
--[[ 4.3.13. Markdown ]] --[[ 4.3.13. Markdown ]]
markdownH1 = {bg=NONE, fg=red, style='bold'}, markdownH1 = {fg=red, style='bold'},
markdownH2 = {bg=NONE, fg=orange, style='bold'}, markdownH2 = {fg=orange, style='bold'},
markdownH3 = {bg=NONE, fg=yellow, style='bold'}, markdownH3 = {fg=yellow, style='bold'},
markdownH4 = {bg=NONE, fg=green_dark, style='bold'}, markdownH4 = {fg=green_dark, style='bold'},
markdownH5 = {bg=NONE, fg=cyan, style='bold'}, markdownH5 = {fg=cyan, style='bold'},
markdownH6 = {bg=NONE, fg=purple_light, style='bold'}, markdownH6 = {fg=purple_light, style='bold'},
mkdBold = 'SpecialChar', mkdBold = 'SpecialChar',
mkdCode = 'Comment', mkdCode = 'Comment',
mkdCodeDelimiter = 'mkdBold', mkdCodeDelimiter = 'mkdBold',
@ -606,10 +606,10 @@ local highlight_groups = {
ALEWarningSign = 'WarningMsg', ALEWarningSign = 'WarningMsg',
--[[ 4.4.2. coc.nvim ]] --[[ 4.4.2. coc.nvim ]]
CocErrorHighlight = {bg=NONE, fg=NONE, style={'undercurl', color='red' }}, CocErrorHighlight = {style={'undercurl', color='red'}},
CocHintHighlight = {bg=NONE, fg=NONE, style={'undercurl', color='magenta' }}, CocHintHighlight = {style={'undercurl', color='magenta'}},
CocInfoHighlight = {bg=NONE, fg=NONE, style={'undercurl', color='pink_light'}}, CocInfoHighlight = {style={'undercurl', color='pink_light'}},
CocWarningHighlight = {bg=NONE, fg=NONE, style={'undercurl', color='orange' }}, CocWarningHighlight = {style={'undercurl', color='orange'}},
CocErrorSign = 'ALEErrorSign', CocErrorSign = 'ALEErrorSign',
CocHintSign = 'HintMsg', CocHintSign = 'HintMsg',
CocInfoSign = 'InfoMsg', CocInfoSign = 'InfoMsg',
@ -620,10 +620,10 @@ local highlight_groups = {
JumpMotion = 'EasyMotion', JumpMotion = 'EasyMotion',
--[[ 4.4.4. vim-gitgutter / vim-signify ]] --[[ 4.4.4. vim-gitgutter / vim-signify ]]
GitGutterAdd = {bg=NONE, fg=green, style=NONE}, GitGutterAdd = {fg=green},
GitGutterChange = {bg=NONE, fg=yellow, style=NONE}, GitGutterChange = {fg=yellow},
GitGutterDelete = {bg=NONE, fg=red, style=NONE}, GitGutterDelete = {fg=red},
GitGutterChangeDelete = {bg=NONE, fg=orange, style=NONE}, GitGutterChangeDelete = {fg=orange},
SignifySignAdd = 'GitGutterAdd', SignifySignAdd = 'GitGutterAdd',
SignifySignChange = 'GitGutterChange', SignifySignChange = 'GitGutterChange',
@ -631,8 +631,8 @@ local highlight_groups = {
SignifySignChangeDelete = 'GitGutterChangeDelete', SignifySignChangeDelete = 'GitGutterChangeDelete',
--[[ 4.4.5. vim-indent-guides ]] --[[ 4.4.5. vim-indent-guides ]]
IndentGuidesOdd = {bg=gray_darker, fg=NONE, style=NONE}, IndentGuidesOdd = {bg=gray_darker},
IndentGuidesEven = {bg=gray_dark, fg=NONE, style=NONE}, IndentGuidesEven = {bg=gray_dark},
--[[ 4.4.7. NERDTree ]] --[[ 4.4.7. NERDTree ]]
NERDTreeCWD = 'Label', NERDTreeCWD = 'Label',