update.sh

This commit is contained in:
Ray Elliott 2022-03-13 19:41:41 +00:00
parent ff8abed01e
commit c0546d77bd
1 changed files with 728 additions and 687 deletions

View File

@ -1,15 +1,12 @@
-- This file should be edited by the user. Read the instructions of each section and then edit them as desired. -- This file should be edited by the user. Read the instructions of each section and then edit them as desired.
--[[ Highlite, a Neovim colorscheme template. --[[ Highlite, a Neovim colorscheme template.
* Author: Iron-E (https://github.com/Iron-E) * Author: Iron-E (https://github.com/Iron-E)
* Repository: https://github.com/nvim-paper-tonic * Repository: https://github.com/Iron-E/nvim-highlite
Initially forked from vim-rnb, a Vim colorsheme template: Initially forked from vim-rnb, a Vim colorsheme template:
* Author: Romain Lafourcade (https://github.com/romainl) * Author: Romain Lafourcade (https://github.com/romainl)
* Canonical URL: https://github.com/romainl/vim-rnb * Canonical URL: https://github.com/romainl/vim-rnb
]] ]] --[[ Introduction
--[[ Introduction
This template is designed to help Neovim users create their own colorschemes without much effort. This template is designed to help Neovim users create their own colorschemes without much effort.
You will not need any additional tooling to run this file. Just open it in Neovim and follow the instructions. You will not need any additional tooling to run this file. Just open it in Neovim and follow the instructions.
@ -20,9 +17,7 @@
3. Define your colors, 3. Define your colors,
4. Define your highlight groups and links, and 4. Define your highlight groups and links, and
5. Sourcing your colorscheme. 5. Sourcing your colorscheme.
]] ]] --[[ Step 1: Renaming
--[[ Step 1: Renaming
* If this file is distributed with a colorscheme it's probably already named correctly * If this file is distributed with a colorscheme it's probably already named correctly
and you can skip this step. and you can skip this step.
* If you forked/cloned/copied this repository to create your own colorscheme, you will have to * If you forked/cloned/copied this repository to create your own colorscheme, you will have to
@ -46,17 +41,12 @@
TIP: If you are on a Unix-based system (or have WSL on Windows) you can use the setup script at the root of this repo. TIP: If you are on a Unix-based system (or have WSL on Windows) you can use the setup script at the root of this repo.
See the README for more details. See the README for more details.
]] ]] --[[ Step 2: Information
--[[ Step 2: Information
In this step you will define information that helps Neovim process: In this step you will define information that helps Neovim process:
1. How users access your colorscheme; 1. How users access your colorscheme;
2. How your colorscheme should be rendered. 2. How your colorscheme should be rendered.
]] ]] -- This is the name of your colorscheme which will be used as per |g:colors_name|.
-- This is the name of your colorscheme which will be used as per |g:colors_name|.
vim.g.colors_name = 'paper-tonic' vim.g.colors_name = 'paper-tonic'
--[[ Step 3: Colors --[[ Step 3: Colors
@ -122,10 +112,10 @@ local c_alert_weak = {'#000000', 203, 'red'}
local c_question = {'#000000', 0, 'black'} local c_question = {'#000000', 0, 'black'}
local c_primary_stronger = { "#7f4b4b", 236, "black" } local c_primary_stronger = {"#7f4b4b", 236, "black"}
local c_primary_strong = { "#5a4444", 236, "black" } local c_primary_strong = {"#5a4444", 236, "black"}
local c_primary = { "#6b5555", 244, "gray" } local c_primary = {"#6b5555", 244, "gray"}
local c_primary_weak = { "#7c6666", 248, "darkgray" } local c_primary_weak = {"#7c6666", 248, "darkgray"}
local c_2_weak = {"#5e955e", 28, "darkgreen"} local c_2_weak = {"#5e955e", 28, "darkgreen"}
local c_2 = {"#008700", 22, "darkgreen"} local c_2 = {"#008700", 22, "darkgreen"}
@ -262,137 +252,140 @@ local 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 = {fg=c_fg, bg=c_bg} local highlight_group_normal = {fg = c_fg, bg = c_bg}
-- 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 = {fg=c_fg_weaker, style='italic'}, Comment = {fg = c_fg_weaker, style = 'italic,bold'},
NonText = {fg=c_fg_weak}, NonText = {fg = c_fg_weak},
EndOfBuffer = 'Comment', EndOfBuffer = 'Comment',
Whitespace = 'NonText', Whitespace = 'NonText',
--[[ 4.1.1. Literals]] --[[ 4.1.1. Literals]]
Constant = {fg=c_fg_strong, style='italic'}, Constant = {fg = c_fg_strong, style = 'italic'},
String = {fg=fg_strong, style='italic'}, String = {fg = fg_strong, style = 'italic'},
Character = 'String', Character = 'String',
Number = 'String', Number = 'String',
Boolean = 'String', Boolean = 'String',
Float = 'Number', Float = 'Number',
--[[ 4.1.2. Identifiers]] --[[ 4.1.2. Identifiers]]
Identifier = {fg=c_primary_weak, style='bold'}, Identifier = {fg = c_primary_weak, style = 'bold'},
Function = {fg=c_primary_strong, style='bold'}, Function = {fg = c_primary_strong, style = 'bold'},
--[[ 4.1.3. Syntax]] --[[ 4.1.3. Syntax]]
Statement = {fg=c_fg_weak}, Statement = {fg = c_fg_weak},
Conditional = {fg=c_fg_strong, style='bold'}, Conditional = {fg = c_fg_strong, style = 'bold'},
Repeat = 'Conditional', Repeat = 'Conditional',
Label = {fg=c_fg_stronger, style='bold'}, Label = {fg = c_fg_stronger, style = 'bold'},
Operator = {fg=c_fg, style='bold'}, Operator = {fg = c_fg, style = 'bold'},
Keyword = {fg=c_fg_weaker, style='bold'}, Keyword = {fg = c_fg_weaker, style = 'bold'},
Exception = {fg=c_fg_exception, style='bold'}, Exception = {fg = c_fg_exception, style = 'bold'},
Noise = {fg=c_fg_weaker}, Noise = {fg = c_fg_weaker},
--[[ 4.1.4. Metatextual Information]] --[[ 4.1.4. Metatextual Information]]
PreProc = {fg=c_fg_weak}, PreProc = {fg = c_fg_weak},
Include = {fg=c_fg_weak, style='bold'}, Include = {fg = c_fg_weak, style = 'bold'},
Define = 'Include', Define = 'Include',
Macro = {fg=c_fg, style='bold'}, Macro = {fg = c_fg, style = 'bold'},
PreCondit = 'Macro', PreCondit = 'Macro',
--[[ 4.1.5. Semantics]] --[[ 4.1.5. Semantics]]
Type = {fg=c_primary, style='bold'}, Type = {fg = c_primary, style = 'bold'},
StorageClass = {fg=c_primary}, StorageClass = {fg = c_primary},
Structure = 'StorageClass', Structure = 'StorageClass',
Typedef = 'StorageClass', Typedef = 'StorageClass',
--[[ 4.1.6. Edge Cases]] --[[ 4.1.6. Edge Cases]]
Special = {fg=c_primary_stronger}, Special = {fg = c_primary_stronger},
SpecialChar = {fg=c_primary_stronger, style='bold'}, SpecialChar = {fg = c_primary_stronger, style = 'bold'},
SpecialKey = 'SpecialCharacter', SpecialKey = 'SpecialCharacter',
Tag = {fg=c_primary_strong, style='bold'}, Tag = {fg = c_primary_strong, style = 'bold'},
Delimiter = 'Noise', Delimiter = 'Noise',
SpecialComment = {fg=c_fg_exception, style='bold'}, SpecialComment = {fg = c_fg_exception, style = 'bold'},
Debug = 'WarningMsg', Debug = 'WarningMsg',
--[[ 4.1.7. Help Syntax]] --[[ 4.1.7. Help Syntax]]
Underlined = {style='underline'}, Underlined = {style = 'underline'},
Ignore = {fg=c_fg_weak}, Ignore = {fg = c_fg_weak},
Error = {fg=c_alert_strong, style='bold'}, Error = {fg = c_alert_strong, style = 'bold'},
Todo = {fg=c_alert_strong}, Todo = {fg = c_alert_strong},
Hint = {fg=c_alert_weak, style='italic'}, Hint = {fg = c_alert_weak, style = 'italic'},
Info = {fg=c_alert_weak, style='italic'}, Info = {fg = c_alert_weak, style = 'italic'},
Warning = {fg=c_alert}, Warning = {fg = c_alert},
--[[ 4.2... Editor UI ]] --[[ 4.2... Editor UI ]]
--[[ 4.2.1. Status Line]] --[[ 4.2.1. Status Line]]
StatusLine = {fg=c_fg, bg=c_bg_ui, style='italic'}, StatusLine = {fg = c_fg, bg = c_bg_ui, style = 'italic'},
StatusLineNC = {fg=c_fg_weaker, bg=c_bg_ui, style='italic'}, StatusLineNC = {fg = c_fg_weaker, bg = c_bg_ui, style = 'italic'},
StatusLineTerm = 'StatusLine', StatusLineTerm = 'StatusLine',
StatusLineTermNC = 'StatusLineNC', StatusLineTermNC = 'StatusLineNC',
--[[ 4.2.2. Separators]] --[[ 4.2.2. Separators]]
VertSplit = {fg=c_bg_hl_strong}, VertSplit = {fg = c_bg_hl_strong},
TabLine = 'StatusLineNC', TabLine = 'StatusLineNC',
TabLineFill = {fg=c_bg_ui, bg=c_bg_ui}, TabLineFill = {fg = c_bg_ui, bg = c_bg_ui},
TabLineSel = 'StatusLine', TabLineSel = 'StatusLine',
Title = {style='bold'}, Title = {style = 'bold'},
--[[ 4.2.3. Conditional Line Highlighting]] --[[ 4.2.3. Conditional Line Highlighting]]
Conceal = 'Noise', Conceal = 'Noise',
CursorLine = {bg=c_bg_hl}, CursorLine = {bg = c_bg_hl},
CursorLineNr = {fg=c_fg_weak, style='bold'}, CursorLineNr = {fg = c_fg_weak, style = 'bold'},
debugBreakpoint = 'ErrorMsg', debugBreakpoint = 'ErrorMsg',
debugPC = 'ColorColumn', debugPC = 'ColorColumn',
LineNr = {fg=c_fg_weak}, LineNr = {fg = c_fg_weak},
QuickFixLine = {bg=c_bg_hl_special_weak, style='bold'}, QuickFixLine = {bg = c_bg_hl_special_weak, style = 'bold'},
Visual = {bg=c_bg_hl_special}, Visual = {bg = c_bg_hl_special},
VisualNOS = {bg=c_bg_hl_special, fg=c_fg_strong, style='bold'}, VisualNOS = {bg = c_bg_hl_special, fg = c_fg_strong, style = 'bold'},
--[[ 4.2.4.1. Popup Menu]] --[[ 4.2.4.1. Popup Menu]]
Pmenu = {fg=c_fg, bg=c_bg_ui}, Pmenu = {fg = c_fg, bg = c_bg_ui},
PmenuSbar = 'Pmenu', PmenuSbar = 'Pmenu',
PmenuSel = {fg=c_fg_strong, bg=c_bg_ui, style='bold'}, PmenuSel = {fg = c_fg_strong, bg = c_bg_ui, style = 'bold'},
PmenuThumb = 'Pmenu', PmenuThumb = 'Pmenu',
WildMenu = {fg=c_fg_strong, bg=c_bg_ui, style='bold'}, WildMenu = {fg = c_fg_strong, bg = c_bg_ui, style = 'bold'},
--[[ 4.2.4.2. Floats]] --[[ 4.2.4.2. Floats]]
NormalFloat = {bg="NONE", fg=c_fg}, NormalFloat = {bg = "NONE", fg = c_fg},
FloatBorder = {bg="NONE", fg=c_fg_stronger}, FloatBorder = {bg = "NONE", fg = c_fg_stronger},
--[[ 4.2.5. Folds]] --[[ 4.2.5. Folds]]
FoldColumn = {fg=c_fg_weak}, FoldColumn = {fg = c_fg_weak},
Folded = {fg=c_fg_strong, style='bold'}, Folded = {fg = c_fg_strong, style = 'bold'},
--[[ 4.2.6. Diffs]] --[[ 4.2.6. Diffs]]
DiffAdd = {bg=c_bg_success}, DiffAdd = {bg = c_bg_success},
DiffChange = {bg=c_bg_modified}, DiffChange = {bg = c_bg_modified},
DiffDelete = {bg=c_bg_fail}, DiffDelete = {bg = c_bg_fail},
DiffText = {fg=c_fg_stronger, bg=c_bg_success}, DiffText = {fg = c_fg_stronger, bg = c_bg_success},
--[[ 4.2.7. Searching]] --[[ 4.2.7. Searching]]
IncSearch = {style='inverse'}, IncSearch = {style = 'inverse'},
MatchParen = {bg=c_bg_hl_special_alt_strong, style={'bold', 'underline', color=c_fg_stronger}}, MatchParen = {
Search = {bg=c_bg_hl_special}, bg = c_bg_hl_special_alt_strong,
style = {'bold', 'underline', color = c_fg_stronger}
},
Search = {bg = c_bg_hl_special},
--[[ 4.2.8. Spelling]] --[[ 4.2.8. Spelling]]
SpellBad = {bg=c_bg_error_weak, fg=c_alert_strong,}, SpellBad = {bg = c_bg_error_weak, fg = c_alert_strong},
SpellCap = {bg=c_bg_error_weak, fg=c_alert}, SpellCap = {bg = c_bg_error_weak, fg = c_alert},
SpellLocal = {bg=c_bg_error_weak, fg=c_alert_weak}, SpellLocal = {bg = c_bg_error_weak, fg = c_alert_weak},
SpellRare = {bg=c_bg_error_weak, fg=c_alert_weak}, SpellRare = {bg = c_bg_error_weak, fg = c_alert_weak},
--[[ 4.2.9. Conditional Column Highlighting]] --[[ 4.2.9. Conditional Column Highlighting]]
ColorColumn = {bg=c_bg_hl_weak}, ColorColumn = {bg = c_bg_hl_weak},
SignColumn = NONE, SignColumn = NONE,
--[[ 4.2.10. Messages]] --[[ 4.2.10. Messages]]
ErrorMsg = {fg=c_alert, style='bold'}, ErrorMsg = {fg = c_alert, style = 'bold'},
HintMsg = {fg=c_alert_weak, style='italic'}, HintMsg = {fg = c_alert_weak, style = 'italic'},
InfoMsg = {fg=c_alert_weak, style='italic'}, InfoMsg = {fg = c_alert_weak, style = 'italic'},
ModeMsg = {fg=c_question}, ModeMsg = {fg = c_question},
WarningMsg = {fg=c_alert, style='bold'}, WarningMsg = {fg = c_alert, style = 'bold'},
Question = {fg=c_question, style='bold'}, Question = {fg = c_question, style = 'bold'},
--[[ 4.2.11. Diagnostic ]] --[[ 4.2.11. Diagnostic ]]
DiagnosticHint = 'Hint', DiagnosticHint = 'Hint',
@ -402,17 +395,17 @@ local highlight_groups = {
DiagnosticInfo = 'Info', DiagnosticInfo = 'Info',
--[[ 4.2.12. LSP ]] --[[ 4.2.12. LSP ]]
LspReferenceRead = {bg=c_bg_hl_special_weak, style='NONE'}, LspReferenceRead = {bg = c_bg_hl_special_weak, style = 'NONE'},
LspReferenceText = {bg=c_bg_hl_special_weak, style='NONE'}, LspReferenceText = {bg = c_bg_hl_special_weak, style = 'NONE'},
LspReferenceWrite = {bg=c_bg_hl_special_weak, style='NONE'}, LspReferenceWrite = {bg = c_bg_hl_special_weak, style = 'NONE'},
--[[ 4.2.13. Cursor ]] --[[ 4.2.13. Cursor ]]
Cursor = {style='inverse'}, Cursor = {style = 'inverse'},
CursorIM = 'Cursor', CursorIM = 'Cursor',
CursorColumn = {bg=c_bg_hl}, CursorColumn = {bg = c_bg_hl},
--[[ 4.2.14. Misc ]] --[[ 4.2.14. Misc ]]
Directory = {fg=c_primary_weak, style='bold'}, Directory = {fg = c_primary_weak, style = 'bold'},
--[[ 4.3. Programming Languages --[[ 4.3. Programming Languages
Everything in this section is OPTIONAL. Feel free to remove everything Everything in this section is OPTIONAL. Feel free to remove everything
@ -472,14 +465,14 @@ local highlight_groups = {
cssAttrComma = 'Noise', cssAttrComma = 'Noise',
cssAttrRegion = 'Keyword', cssAttrRegion = 'Keyword',
cssBraces = 'Delimiter', cssBraces = 'Delimiter',
cssClassName = {fg=c_2}, cssClassName = {fg = c_2},
cssClassNameDot = 'Noise', cssClassNameDot = 'Noise',
cssFlexibleBoxAttr = 'cssAttr', cssFlexibleBoxAttr = 'cssAttr',
cssFunctionComma = 'Noise', cssFunctionComma = 'Noise',
cssImportant = 'Exception', cssImportant = 'Exception',
cssNoise = 'Noise', cssNoise = 'Noise',
cssProp = {fg=c_primary_weak}, cssProp = {fg = c_primary_weak},
cssPseudoClass = {fg=c_2_weak}, cssPseudoClass = {fg = c_2_weak},
cssPseudoClassId = 'cssSelectorOp', cssPseudoClassId = 'cssSelectorOp',
cssSelectorOp = 'Operator', cssSelectorOp = 'Operator',
cssTagName = 'htmlTagName', cssTagName = 'htmlTagName',
@ -500,12 +493,12 @@ local highlight_groups = {
-- added via custom scm highlights -- added via custom scm highlights
cssTSProperty = 'cssProp', cssTSProperty = 'cssProp',
cssIdentifier = {fg=c_2_strong, style='bold'}, cssIdentifier = {fg = c_2_strong, style = 'bold'},
cssTSType = 'htmlTagName', cssTSType = 'htmlTagName',
cssIdSelector = 'SpecialChar', cssIdSelector = 'SpecialChar',
cssNestingSelector = {fg=c_2_strong}, cssNestingSelector = {fg = c_2_strong},
cssUniversalSelector = 'SpecialChar', cssUniversalSelector = 'SpecialChar',
cssPropertyValue = {fg=c_fg, style='bold'}, cssPropertyValue = {fg = c_fg, style = 'bold'},
cssMediaQuery = 'Function', cssMediaQuery = 'Function',
cssMediaQueryValue = 'cssAtRule', cssMediaQueryValue = 'cssAtRule',
cssMediaQueryValueUnit = 'cssMediaQueryValue', cssMediaQueryValueUnit = 'cssMediaQueryValue',
@ -548,8 +541,8 @@ local highlight_groups = {
--[[ 4.3.8. HTML ]] --[[ 4.3.8. HTML ]]
htmlArg = 'Label', htmlArg = 'Label',
htmlBold = {style='bold'}, htmlBold = {style = 'bold'},
htmlTitle = {fg=c_fg_stronger, style='bold'}, htmlTitle = {fg = c_fg_stronger, style = 'bold'},
htmlEndTag = 'htmlTag', htmlEndTag = 'htmlTag',
htmlH1 = 'markdownH1', htmlH1 = 'markdownH1',
htmlH2 = 'markdownH2', htmlH2 = 'markdownH2',
@ -557,13 +550,13 @@ local highlight_groups = {
htmlH4 = 'markdownH4', htmlH4 = 'markdownH4',
htmlH5 = 'markdownH5', htmlH5 = 'markdownH5',
htmlH6 = 'markdownH6', htmlH6 = 'markdownH6',
htmlItalic = {style='italic'}, htmlItalic = {style = 'italic'},
htmlSpecialTagName = 'Keyword', htmlSpecialTagName = 'Keyword',
htmlTag = {fg=c_3}, htmlTag = {fg = c_3},
htmlTagN = htmlTagName, htmlTagN = htmlTagName,
htmlTagName = {fg=c_3}, htmlTagName = {fg = c_3},
htmlTSString = {fg=c_fg_strong}, htmlTSString = {fg = c_fg_strong},
htmlTSTag = 'htmlTag', htmlTSTag = 'htmlTag',
htmlTSTagAttribute = 'Statement', htmlTSTagAttribute = 'Statement',
htmlTSTitle = 'htmlTitle', htmlTSTitle = 'htmlTitle',
@ -609,7 +602,7 @@ local highlight_groups = {
luaSpecialValue = 'Function', luaSpecialValue = 'Function',
luaStringLongTag = function(self) luaStringLongTag = function(self)
local delimiter = self.Delimiter local delimiter = self.Delimiter
return {bg=delimiter.bg, fg=delimiter.fg, style='italic'} return {bg = delimiter.bg, fg = delimiter.fg, style = 'italic'}
end, end,
--[[ 4.3.12. Make ]] --[[ 4.3.12. Make ]]
@ -619,18 +612,18 @@ local highlight_groups = {
--[[ 4.3.13. Markdown ]] --[[ 4.3.13. Markdown ]]
markdownCode = 'mkdCode', markdownCode = 'mkdCode',
markdownCodeDelimiter = 'mkdCodeDelimiter', markdownCodeDelimiter = 'mkdCodeDelimiter',
markdownH1 = {fg=c_fg_stronger, style='bold'}, markdownH1 = {fg = c_fg_stronger, style = 'bold'},
markdownH2 = {fg=c_fg_stronger, style='bold'}, markdownH2 = {fg = c_fg_stronger, style = 'bold'},
markdownH3 = {fg=c_fg_strong, style='bold'}, markdownH3 = {fg = c_fg_strong, style = 'bold'},
markdownH4 = {fg=c_fg_strong, style='bold'}, markdownH4 = {fg = c_fg_strong, style = 'bold'},
markdownH5 = {fg=c_fg_strong, style='bold'}, markdownH5 = {fg = c_fg_strong, style = 'bold'},
markdownH6 = {fg=c_fg_strong, style='bold'}, markdownH6 = {fg = c_fg_strong, style = 'bold'},
markdownLinkDelimiter = 'Delimiter', markdownLinkDelimiter = 'Delimiter',
markdownLinkTextDelimiter = 'markdownLinkDelimiter', markdownLinkTextDelimiter = 'markdownLinkDelimiter',
markdownUrl = {fg=c_primary}, markdownUrl = {fg = c_primary},
mkdBold = {style='bold'}, mkdBold = {style = 'bold'},
mkdBoldItalic = 'mkdBold', mkdBoldItalic = 'mkdBold',
mkdCode = {fg=c_primary_weak}, mkdCode = {fg = c_primary_weak},
mkdCodeDelimiter = 'Noise', mkdCodeDelimiter = 'Noise',
mkdCodeEnd = 'mkdCodeStart', mkdCodeEnd = 'mkdCodeStart',
mkdCodeStart = 'mkdCodeDelimiter', mkdCodeStart = 'mkdCodeDelimiter',
@ -638,7 +631,12 @@ local highlight_groups = {
mkdItalic = 'mkdBold', mkdItalic = 'mkdBold',
mkdLineBreak = 'NonText', mkdLineBreak = 'NonText',
mkdListItem = 'Special', mkdListItem = 'Special',
mkdRule = function(self) return {fg=self.Ignore.fg, style={'underline', color=self.Delimiter.fg}} end, mkdRule = function(self)
return {
fg = self.Ignore.fg,
style = {'underline', color = self.Delimiter.fg}
}
end,
mkdSnippetPHP = 'mkdCode', mkdSnippetPHP = 'mkdCode',
--[[ 4.3.20. Python ]] --[[ 4.3.20. Python ]]
@ -821,10 +819,10 @@ local highlight_groups = {
ALEWarningSign = 'WarningMsg', ALEWarningSign = 'WarningMsg',
--[[ 4.4.2. coc.nvim ]] --[[ 4.4.2. coc.nvim ]]
CocErrorHighlight = {style={'undercurl', color=c_alert}}, CocErrorHighlight = {style = {'undercurl', color = c_alert}},
CocHintHighlight = {style={'undercurl', color=c_primary_strong}}, CocHintHighlight = {style = {'undercurl', color = c_primary_strong}},
CocInfoHighlight = {style={'undercurl', color=pink_light}}, CocInfoHighlight = {style = {'undercurl', color = pink_light}},
CocWarningHighlight = {style={'undercurl', color=c_primary_strong}}, CocWarningHighlight = {style = {'undercurl', color = c_primary_strong}},
CocErrorSign = 'ALEErrorSign', CocErrorSign = 'ALEErrorSign',
CocHintSign = 'HintMsg', CocHintSign = 'HintMsg',
CocInfoSign = 'InfoMsg', CocInfoSign = 'InfoMsg',
@ -835,10 +833,10 @@ local highlight_groups = {
JumpMotion = 'EasyMotion', JumpMotion = 'EasyMotion',
--[[ 4.4.4. vim-gitgutter / vim-signify ]] --[[ 4.4.4. vim-gitgutter / vim-signify ]]
GitGutterAdd = {fg=c_success}, GitGutterAdd = {fg = c_success},
GitGutterChange = {fg=c_modified}, GitGutterChange = {fg = c_modified},
GitGutterDelete = {fg=c_fail}, GitGutterDelete = {fg = c_fail},
GitGutterChangeDelete = {fg=c_modified}, GitGutterChangeDelete = {fg = c_modified},
SignifySignAdd = 'GitGutterAdd', SignifySignAdd = 'GitGutterAdd',
SignifySignChange = 'GitGutterChange', SignifySignChange = 'GitGutterChange',
@ -846,8 +844,8 @@ local highlight_groups = {
SignifySignChangeDelete = 'GitGutterChangeDelete', SignifySignChangeDelete = 'GitGutterChangeDelete',
--[[ 4.4.5. vim-indent-guides ]] --[[ 4.4.5. vim-indent-guides ]]
IndentGuidesOdd = {bg=c_bg_hl}, IndentGuidesOdd = {bg = c_bg_hl},
IndentGuidesEven = {bg=c_bg_hl_strong}, IndentGuidesEven = {bg = c_bg_hl_strong},
--[[ 4.4.7. NERDTree ]] --[[ 4.4.7. NERDTree ]]
NERDTreeCWD = 'Label', NERDTreeCWD = 'Label',
@ -862,7 +860,7 @@ local highlight_groups = {
--[[ 4.4.8. nvim-treesitter ]] --[[ 4.4.8. nvim-treesitter ]]
TSConstBuiltin = 'Constant', TSConstBuiltin = 'Constant',
TSConstructor = 'Typedef', TSConstructor = 'Typedef',
TSKeywordFunction = {fg=c_fg_weak, style='bold'}, TSKeywordFunction = {fg = c_fg_weak, style = 'bold'},
TSFuncBuiltin = 'Function', TSFuncBuiltin = 'Function',
TSStringEscape = 'Character', TSStringEscape = 'Character',
TSStringRegex = 'SpecialChar', TSStringRegex = 'SpecialChar',
@ -873,27 +871,33 @@ local highlight_groups = {
--[[ 4.4.9. barbar.nvim ]] --[[ 4.4.9. barbar.nvim ]]
BufferCurrent = 'TabLineSel', BufferCurrent = 'TabLineSel',
BufferCurrentIndex = function(self) return {fg=self.InfoMsg.fg, bg=self.BufferCurrent.bg} end, BufferCurrentIndex = function(self)
BufferCurrentMod = {fg=c_modified, bg=c_bg, style='bold'}, return {fg = self.InfoMsg.fg, bg = self.BufferCurrent.bg}
end,
BufferCurrentMod = {fg = c_modified, bg = c_bg, style = 'bold'},
BufferCurrentSign = 'HintMsg', BufferCurrentSign = 'HintMsg',
BufferCurrentTarget = 'BufferCurrentSign', BufferCurrentTarget = 'BufferCurrentSign',
BufferInactive = 'BufferVisible', BufferInactive = 'BufferVisible',
BufferInactiveIndex = function(self) return {fg=self.InfoMsg.fg, bg=self.BufferInactive.bg} end, BufferInactiveIndex = function(self)
return {fg = self.InfoMsg.fg, bg = self.BufferInactive.bg}
end,
BufferInactiveMod = 'BufferVisibleMod', BufferInactiveMod = 'BufferVisibleMod',
BufferInactiveSign = 'BufferVisibleSign', BufferInactiveSign = 'BufferVisibleSign',
BufferInactiveTarget = 'BufferVisibleTarget', BufferInactiveTarget = 'BufferVisibleTarget',
BufferTabpages = {fg=BG, bg=FG, style='bold'}, BufferTabpages = {fg = BG, bg = FG, style = 'bold'},
-- BufferTabpageFill = 'TabLineFill', -- BufferTabpageFill = 'TabLineFill',
BufferVisible = 'TabLine', BufferVisible = 'TabLine',
BufferVisibleIndex = function(self) return {fg=self.InfoMsg.fg, bg=self.BufferVisible.bg} end, BufferVisibleIndex = function(self)
BufferVisibleMod = {fg=white, bg=c_bg_darkest, style='italic'}, return {fg = self.InfoMsg.fg, bg = self.BufferVisible.bg}
end,
BufferVisibleMod = {fg = white, bg = c_bg_darkest, style = 'italic'},
BufferVisibleSign = 'BufferVisible', BufferVisibleSign = 'BufferVisible',
BufferVisibleTarget = function(self) BufferVisibleTarget = function(self)
local super = self.BufferVisibleMod local super = self.BufferVisibleMod
return {fg=super.fg, bg=super.bg, style='bold'} return {fg = super.fg, bg = super.bg, style = 'bold'}
end, end,
--[[ 4.4.10. vim-sandwhich ]] --[[ 4.4.10. vim-sandwhich ]]
@ -912,27 +916,61 @@ local highlight_groups = {
--[[ 4.4.13. indent-blankline.nvim ]] --[[ 4.4.13. indent-blankline.nvim ]]
-- IndentBlanklineChar = function(self) return vim.tbl_extend('force', (fg=c_bg_ui) {style='nocombine'}) end, -- IndentBlanklineChar = function(self) return vim.tbl_extend('force', (fg=c_bg_ui) {style='nocombine'}) end,
IndentBlanklineChar = {fg=c_bg_hl_weak, style='nocombine'}, IndentBlanklineChar = {fg = c_bg_hl_weak, style = 'nocombine'},
IndentBlanklineContextChar = {fg=c_fg, style='nocombine'}, IndentBlanklineContextChar = {fg = c_fg, style = 'nocombine'},
IndentBlanklineSpaceChar = 'IndentBlanklineChar', IndentBlanklineSpaceChar = 'IndentBlanklineChar',
--[[ 4.4.14. trouble.nvim ]] --[[ 4.4.14. trouble.nvim ]]
TroubleCount = function(self) return vim.tbl_extend('force', self.Number, {style='underline'}) end, TroubleCount = function(self)
return vim.tbl_extend('force', self.Number, {style = 'underline'})
end,
--[[ 4.4.14. todo-comments.nvim ]] --[[ 4.4.14. todo-comments.nvim ]]
TodoFgFIX = function(self) return {fg=self.ErrorMsg.fg} end, TodoFgFIX = function(self) return {fg = self.ErrorMsg.fg} end,
TodoFgHACK = function(self) return {fg=self.Todo.fg} end, TodoFgHACK = function(self) return {fg = self.Todo.fg} end,
TodoFgNOTE = 'HintMsg', TodoFgNOTE = 'HintMsg',
TodoFgPERF = 'InfoMsg', TodoFgPERF = 'InfoMsg',
TodoFgTODO = function(_) return {fg=cyan, style='italic'} end, TodoFgTODO = function(_) return {fg = cyan, style = 'italic'} end,
TodoFgWARN = function(self) return {fg=self.WarningMsg.fg} end, TodoFgWARN = function(self) return {fg = self.WarningMsg.fg} end,
TodoBgFIX = function(self) return {fg=c_bg, bg=self.ErrorMsg.fg, style={'bold', 'italic', 'nocombine'}} end, TodoBgFIX = function(self)
TodoBgHACK = function(self) return {fg=c_bg, bg=self.Todo.fg, style={'bold', 'italic', 'nocombine'}} end, return {
TodoBgNOTE = function(self) return {fg=c_bg, bg=self.Hint.bg, style={'bold', 'italic', 'nocombine'}} end, fg = c_bg,
TodoBgPERF = function(self) return {fg=c_bg, bg=self.Info.bg, style={'bold', 'italic', 'nocombine'}} end, bg = self.ErrorMsg.fg,
TodoBgTODO = function(_) return {fg=c_bg, bg=cyan, style={'bold', 'italic', 'nocombine'}} end, style = {'bold', 'italic', 'nocombine'}
TodoBgWARN = function(self) return {fg=c_bg, bg=self.Warning.bg, style={'bold', 'italic', 'nocombine'}} end, }
end,
TodoBgHACK = function(self)
return {
fg = c_bg,
bg = self.Todo.fg,
style = {'bold', 'italic', 'nocombine'}
}
end,
TodoBgNOTE = function(self)
return {
fg = c_bg,
bg = self.Hint.bg,
style = {'bold', 'italic', 'nocombine'}
}
end,
TodoBgPERF = function(self)
return {
fg = c_bg,
bg = self.Info.bg,
style = {'bold', 'italic', 'nocombine'}
}
end,
TodoBgTODO = function(_)
return {fg = c_bg, bg = cyan, style = {'bold', 'italic', 'nocombine'}}
end,
TodoBgWARN = function(self)
return {
fg = c_bg,
bg = self.Warning.bg,
style = {'bold', 'italic', 'nocombine'}
}
end,
TodoSignFIX = 'TodoFgFIX', TodoSignFIX = 'TodoFgFIX',
TodoSignHACK = 'TodoFgHACK', TodoSignHACK = 'TodoFgHACK',
@ -955,14 +993,20 @@ local highlight_groups = {
packerPackageNotLoaded = 'Ignore', packerPackageNotLoaded = 'Ignore',
packerStatusFail = 'Statement', packerStatusFail = 'Statement',
packerStatusSuccess = 'packerStatusFail', packerStatusSuccess = 'packerStatusFail',
packerSuccess = function(self) return {fg=c_success, style=self.packerFail.style} end, packerSuccess = function(self)
return {fg = c_success, style = self.packerFail.style}
end,
-- [[ 5.0.1 custom ]] -- [[ 5.0.1 custom ]]
TabLineFill = 'StatusLine', TabLineFill = 'StatusLine',
TabLineItem = {fg=c_fg, bg=c_bg_ui, style='italic'}, TabLineItem = {fg = c_fg, bg = c_bg_ui, style = 'italic'},
TabLineItemSel = {fg=c_fg_strong, bg=c_bg_ui, style={'italic', 'bold'}}, TabLineItemSel = {
TabLineNum = {fg=c_fg_weak, bg=c_bg_ui}, fg = c_fg_strong,
TabLineNumSel = {fg=c_fg_weak, bg=c_bg_ui} bg = c_bg_ui,
style = {'italic', 'bold'}
},
TabLineNum = {fg = c_fg_weak, bg = c_bg_ui},
TabLineNumSel = {fg = c_fg_weak, bg = c_bg_ui}
} }
--[[ Step 5: Terminal Colors --[[ Step 5: Terminal Colors
@ -1080,10 +1124,7 @@ local terminal_colors = {
is correctly set up if they want to enjoy the best possible experience. is correctly set up if they want to enjoy the best possible experience.
]] ]]
require(vim.g.colors_name)( require(vim.g.colors_name)(highlight_group_normal, highlight_groups,
highlight_group_normal, terminal_colors)
highlight_groups,
terminal_colors
)
-- Thanks to Romain Lafourcade (https://github.com/romainl) for the original template (romainl/vim-rnb). -- Thanks to Romain Lafourcade (https://github.com/romainl) for the original template (romainl/vim-rnb).