feat: implement `Color` abstraction
This commit is contained in:
Daniel Hill
parent
440a37c272
commit
34aa638d32
|
|
@ -0,0 +1,41 @@
|
|||
---@class Color
|
||||
---@field private value integer|nil
|
||||
local Color = {}
|
||||
Color.__index = Color
|
||||
|
||||
---Create a new color
|
||||
---@param value integer
|
||||
---@return table
|
||||
function Color.new(value)
|
||||
local color = setmetatable({
|
||||
value = value,
|
||||
}, Color)
|
||||
return color
|
||||
end
|
||||
|
||||
---Create the "NONE" color
|
||||
---@return table
|
||||
function Color.none()
|
||||
local color = setmetatable({
|
||||
value = nil,
|
||||
}, Color)
|
||||
return color
|
||||
end
|
||||
|
||||
---Get hexadecimal color value as a string
|
||||
---@return string
|
||||
function Color:to_string()
|
||||
if self.value == nil then
|
||||
return "NONE"
|
||||
end
|
||||
|
||||
-- special edge case for BLACK where
|
||||
-- "#0" is returned, which is invalid to Neovim
|
||||
if self.value == 0 then
|
||||
return "#000000"
|
||||
end
|
||||
|
||||
return string.format("#%x", self.value)
|
||||
end
|
||||
|
||||
return Color
|
||||
|
|
@ -7,136 +7,136 @@ local M = {}
|
|||
local function set_terminal_colors()
|
||||
-- terminal colors adapted from
|
||||
-- https://github.com/drsooch/gruber-darker-vim/blob/master/colors/GruberDarker.vim#L202
|
||||
vim.g.terminal_color_0 = c.default["bg+1"]
|
||||
vim.g.terminal_color_8 = c.default["bg+1"]
|
||||
vim.g.terminal_color_0 = c.default["bg+1"]:to_string()
|
||||
vim.g.terminal_color_8 = c.default["bg+1"]:to_string()
|
||||
|
||||
vim.g.terminal_color_1 = c.default["red+1"]
|
||||
vim.g.terminal_color_9 = c.default["red+1"]
|
||||
vim.g.terminal_color_1 = c.default["red+1"]:to_string()
|
||||
vim.g.terminal_color_9 = c.default["red+1"]:to_string()
|
||||
|
||||
vim.g.terminal_color_2 = c.default.green
|
||||
vim.g.terminal_color_10 = c.default.green
|
||||
vim.g.terminal_color_2 = c.default.green:to_string()
|
||||
vim.g.terminal_color_10 = c.default.green:to_string()
|
||||
|
||||
vim.g.terminal_color_3 = c.default.yellow
|
||||
vim.g.terminal_color_11 = c.default.yellow
|
||||
vim.g.terminal_color_3 = c.default.yellow:to_string()
|
||||
vim.g.terminal_color_11 = c.default.yellow:to_string()
|
||||
|
||||
vim.g.terminal_color_4 = c.default.niagara
|
||||
vim.g.terminal_color_12 = c.default.niagara
|
||||
vim.g.terminal_color_4 = c.default.niagara:to_string()
|
||||
vim.g.terminal_color_12 = c.default.niagara:to_string()
|
||||
|
||||
vim.g.terminal_color_5 = c.default.purple
|
||||
vim.g.terminal_color_13 = c.default.purple
|
||||
vim.g.terminal_color_5 = c.default.wisteria:to_string()
|
||||
vim.g.terminal_color_13 = c.default.wisteria:to_string()
|
||||
|
||||
vim.g.terminal_color_6 = c.default.niagara
|
||||
vim.g.terminal_color_14 = c.default.niagara
|
||||
vim.g.terminal_color_6 = c.default.niagara:to_string()
|
||||
vim.g.terminal_color_14 = c.default.niagara:to_string()
|
||||
|
||||
vim.g.terminal_color_7 = c.default.fg
|
||||
vim.g.terminal_color_15 = c.default.fg
|
||||
vim.g.terminal_color_7 = c.default.fg:to_string()
|
||||
vim.g.terminal_color_15 = c.default.fg:to_string()
|
||||
|
||||
vim.g.terminal_color_background = c.default["bg+1"]
|
||||
vim.g.terminal_color_foreground = c.default.white
|
||||
vim.g.terminal_color_background = c.default["bg+1"]:to_string()
|
||||
vim.g.terminal_color_foreground = c.default.white:to_string()
|
||||
end
|
||||
|
||||
function M.setup()
|
||||
set_terminal_colors()
|
||||
|
||||
M.groups = {
|
||||
Comment = { fg = c.default.brown, italic = config.comment_italics and config.italic }, -- any comment
|
||||
ColorColumn = { bg = c.default["bg+2"] }, -- used for the columns set with 'colorcolumn'
|
||||
Conceal = { fg = c.default.fg, bg = c.default.bg }, -- placeholder characters substituted for concealed text (see 'conceallevel')
|
||||
Cursor = { bg = c.default.yellow }, -- character under the cursor
|
||||
lCursor = { fg = c.default.none, bg = c.default.yellow }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
|
||||
CursorIM = { fg = c.default.none, bg = c.default.yellow }, -- like Cursor, but used when in IME mode |CursorIM|
|
||||
CursorColumn = { bg = c.default["bg+2"] }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
|
||||
CursorLine = { bg = c.default["bg+1"] }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set.
|
||||
-- Directory = { fg = c.default.lightblue }, -- directory names (and other special names in listings)
|
||||
DiffAdd = { fg = c.default.green, bg = c.default.none }, -- diff mode: Added line |diff.txt|
|
||||
DiffChange = { fg = c.default.yellow, bg = c.default.none }, -- diff mode: Changed line |diff.txt|
|
||||
DiffDelete = { fg = c.default["red+1"], bg = c.default.none }, -- diff mode: Deleted line |diff.txt|
|
||||
DiffText = { fg = c.default.yellow, bg = c.default.none }, -- diff mode: Changed text within a changed line |diff.txt|
|
||||
EndOfBuffer = { fg = c.default.fg, bg = c.default.bg }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|.
|
||||
TermCursor = { bg = c.default.yellow }, -- cursor in a focused terminal
|
||||
Comment = { fg = c.default.brown:to_string(), italic = config.comment_italics and config.italic }, -- any comment
|
||||
ColorColumn = { bg = c.default["bg+2"]:to_string() }, -- used for the columns set with 'colorcolumn'
|
||||
Conceal = { fg = c.default.fg:to_string(), bg = c.default.bg:to_string() }, -- placeholder characters substituted for concealed text (see 'conceallevel')
|
||||
Cursor = { bg = c.default.yellow:to_string() }, -- character under the cursor
|
||||
lCursor = { fg = c.default.none:to_string(), bg = c.default.yellow:to_string() }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
|
||||
CursorIM = { fg = c.default.none:to_string(), bg = c.default.yellow:to_string() }, -- like Cursor, but used when in IME mode |CursorIM|
|
||||
CursorColumn = { bg = c.default["bg+2"]:to_string() }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
|
||||
CursorLine = { bg = c.default["bg+1"]:to_string() }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set.
|
||||
-- Directory = { fg = c.default.lightblue:to_string() }, -- directory names (and other special names in listings)
|
||||
DiffAdd = { fg = c.default.green:to_string(), bg = c.default.none:to_string() }, -- diff mode: Added line |diff.txt|
|
||||
DiffChange = { fg = c.default.yellow:to_string(), bg = c.default.none:to_string() }, -- diff mode: Changed line |diff.txt|
|
||||
DiffDelete = { fg = c.default["red+1"]:to_string(), bg = c.default.none:to_string() }, -- diff mode: Deleted line |diff.txt|
|
||||
DiffText = { fg = c.default.yellow:to_string(), bg = c.default.none:to_string() }, -- diff mode: Changed text within a changed line |diff.txt|
|
||||
EndOfBuffer = { fg = c.default.fg:to_string(), bg = c.default.bg:to_string() }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|.
|
||||
TermCursor = { bg = c.default.yellow:to_string() }, -- cursor in a focused terminal
|
||||
-- TermCursorNC= { }, -- cursor in an unfocused terminal
|
||||
ErrorMsg = { fg = c.default.white, bg = c.default.red }, -- error messages on the command line
|
||||
VertSplit = { fg = c.default["fg+2"], bg = c.default["bg+1"] }, -- the column separating vertically split windows
|
||||
WinSeparator = { fg = c.default["bg+2"], bold = config.bold }, -- the column separating vertically split windows
|
||||
Folded = { fg = c.default.brown, bg = c.default["fg+2"], italic = true }, -- line used for closed folds
|
||||
FoldColumn = { fg = c.default.brown, bg = c.default["fg+2"] }, -- 'foldcolumn'
|
||||
SignColumn = { fg = c.default["bg+2"], bg = c.default.none }, -- column where |signs| are displayed
|
||||
ErrorMsg = { fg = c.default.white:to_string(), bg = c.default.red:to_string() }, -- error messages on the command line
|
||||
VertSplit = { fg = c.default["fg+2"]:to_string(), bg = c.default["bg+1"]:to_string() }, -- the column separating vertically split windows
|
||||
WinSeparator = { fg = c.default["bg+2"]:to_string(), bold = config.bold }, -- the column separating vertically split windows
|
||||
Folded = { fg = c.default.brown:to_string(), bg = c.default["fg+2"]:to_string(), italic = true }, -- line used for closed folds
|
||||
FoldColumn = { fg = c.default.brown:to_string(), bg = c.default["fg+2"]:to_string() }, -- 'foldcolumn'
|
||||
SignColumn = { fg = c.default["bg+2"]:to_string(), bg = c.default.none:to_string() }, -- column where |signs| are displayed
|
||||
-- SignColumnSB = { bg = c.bg_sidebar, fg = c.fg_gutter }, -- column where |signs| are displayed
|
||||
-- Substitute = { bg = c.red, fg = c.black }, -- |:substitute| replacement text highlighting
|
||||
LineNr = { fg = c.default["bg+4"] }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
|
||||
CursorLineNr = { fg = c.default.yellow }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
|
||||
MatchParen = { fg = c.default.fg, bg = c.default.wisteria }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
|
||||
ModeMsg = { fg = c.default["fg+2"] }, -- 'showmode' message (e.g., "-- INSERT -- ")
|
||||
LineNr = { fg = c.default["bg+4"]:to_string() }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
|
||||
CursorLineNr = { fg = c.default.yellow:to_string() }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
|
||||
MatchParen = { fg = c.default.fg:to_string(), bg = c.default.wisteria:to_string() }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
|
||||
ModeMsg = { fg = c.default["fg+2"]:to_string() }, -- 'showmode' message (e.g., "-- INSERT -- ")
|
||||
-- MsgArea = { fg = c.fg_dark }, -- Area for messages and cmdline
|
||||
-- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display'
|
||||
MoreMsg = { fg = c.default["fg+2"] }, -- |more-prompt|
|
||||
NonText = { fg = c.default["fg+2"] }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
|
||||
Normal = { fg = c.default.fg, bg = c.default.bg }, -- normal text
|
||||
NormalNC = { fg = c.default.fg, bg = c.default.bg }, -- normal text in non-current windows
|
||||
NormalSB = { fg = c.default.fg, bg = c.default.bg }, -- normal text in sidebar
|
||||
NormalFloat = { fg = c.default.fg, bg = c.default.bg }, -- Normal text in floating windows.
|
||||
FloatBorder = { fg = c.default["bg+2"], bg = c.default["bg-1"] },
|
||||
Pmenu = { fg = c.default.fg, bg = c.default["bg+1"] }, -- Popup menu: normal item.
|
||||
PmenuSel = { fg = c.default.fg, bg = c.default["bg+2"] }, -- Popup menu: selected item.
|
||||
PmenuSbar = { bg = c.default.bg }, -- Popup menu: scrollbar.
|
||||
PmenuThumb = { bg = c.default.bg }, -- Popup menu: Thumb of the scrollbar.
|
||||
Question = { fg = c.default.niagara }, -- |hit-enter| prompt and yes/no questions
|
||||
QuickFixLine = { bg = c.default["bg+2"], bold = config.bold }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
|
||||
Search = { fg = c.default.black, bg = c.default.yellow }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
|
||||
IncSearch = { fg = c.default.black, bg = c.default["fg+2"] }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
|
||||
MoreMsg = { fg = c.default["fg+2"]:to_string() }, -- |more-prompt|
|
||||
NonText = { fg = c.default["fg+2"]:to_string() }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
|
||||
Normal = { fg = c.default.fg:to_string(), bg = c.default.bg:to_string() }, -- normal text
|
||||
NormalNC = { fg = c.default.fg:to_string(), bg = c.default.bg:to_string() }, -- normal text in non-current windows
|
||||
NormalSB = { fg = c.default.fg:to_string(), bg = c.default.bg:to_string() }, -- normal text in sidebar
|
||||
NormalFloat = { fg = c.default.fg:to_string(), bg = c.default.bg:to_string() }, -- Normal text in floating windows.
|
||||
FloatBorder = { fg = c.default["bg+2"]:to_string(), bg = c.default["bg-1"]:to_string() },
|
||||
Pmenu = { fg = c.default.fg:to_string(), bg = c.default["bg+1"]:to_string() }, -- Popup menu: normal item.
|
||||
PmenuSel = { fg = c.default.fg:to_string(), bg = c.default["bg+2"]:to_string() }, -- Popup menu: selected item.
|
||||
PmenuSbar = { bg = c.default.bg:to_string() }, -- Popup menu: scrollbar.
|
||||
PmenuThumb = { bg = c.default.bg:to_string() }, -- Popup menu: Thumb of the scrollbar.
|
||||
Question = { fg = c.default.niagara:to_string() }, -- |hit-enter| prompt and yes/no questions
|
||||
QuickFixLine = { bg = c.default["bg+2"]:to_string(), bold = config.bold }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
|
||||
Search = { fg = c.default.black:to_string(), bg = c.default.yellow:to_string() }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
|
||||
IncSearch = { fg = c.default.black:to_string(), bg = c.default["fg+2"]:to_string() }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
|
||||
CurSearch = { link = "IncSearch" },
|
||||
SpecialKey = { fg = c.default["fg+2"] }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace|
|
||||
SpecialKey = { fg = c.default["fg+2"]:to_string() }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace|
|
||||
SpellBad = { undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
|
||||
SpellCap = { undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
|
||||
SpellLocal = { undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
|
||||
SpellRare = { undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise.
|
||||
StatusLine = { fg = c.default.white, bg = c.default["bg+1"] }, -- status line of current window
|
||||
StatusLineNC = { fg = c.default.quartz, bg = c.default["bg+1"] }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
|
||||
TabLine = { bg = c.default.none }, -- tab pages line, not active tab page label
|
||||
TabLineFill = { fg = c.default["bg+4"], bg = c.default["bg+1"] }, -- tab pages line, where there are no labels
|
||||
TabLineSel = { fg = c.default.yellow, bg = c.default.none, bold = config.bold }, -- tab pages line, active tab page label
|
||||
Title = { fg = c.default.quartz }, -- titles for output from ":set all", ":autocmd" etc.
|
||||
Visual = { bg = c.default["bg+2"] }, -- Visual mode selection
|
||||
VisualNOS = { fg = c.default.red }, -- Visual mode selection when vim is "Not Owning the Selection".
|
||||
WarningMsg = { fg = c.default.red }, -- warning messages
|
||||
Whitespace = { fg = c.default["bg+4"], bg = c.default.none }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
|
||||
WildMenu = { fg = c.default.black, bg = c.default.yellow }, -- current match in 'wildmenu' completion
|
||||
StatusLine = { fg = c.default.white:to_string(), bg = c.default["bg+1"]:to_string() }, -- status line of current window
|
||||
StatusLineNC = { fg = c.default.quartz:to_string(), bg = c.default["bg+1"]:to_string() }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
|
||||
TabLine = { bg = c.default.none:to_string() }, -- tab pages line, not active tab page label
|
||||
TabLineFill = { fg = c.default["bg+4"]:to_string(), bg = c.default["bg+1"]:to_string() }, -- tab pages line, where there are no labels
|
||||
TabLineSel = { fg = c.default.yellow:to_string(), bg = c.default.none:to_string(), bold = config.bold }, -- tab pages line, active tab page label
|
||||
Title = { fg = c.default.quartz:to_string() }, -- titles for output from ":set all", ":autocmd" etc.
|
||||
Visual = { bg = c.default["bg+2"]:to_string() }, -- Visual mode selection
|
||||
VisualNOS = { fg = c.default.red:to_string() }, -- Visual mode selection when vim is "Not Owning the Selection".
|
||||
WarningMsg = { fg = c.default.red:to_string() }, -- warning messages
|
||||
Whitespace = { fg = c.default["bg+4"]:to_string(), bg = c.default.none:to_string() }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
|
||||
WildMenu = { fg = c.default.black:to_string(), bg = c.default.yellow:to_string() }, -- current match in 'wildmenu' completion
|
||||
-- These groups are not listed as default vim groups,
|
||||
-- but they are defacto standard group names for syntax highlighting.
|
||||
-- commented out groups should chain up to their "preferred" group by
|
||||
-- default,
|
||||
-- Uncomment and edit if you want more specific syntax highlighting.
|
||||
|
||||
Constant = { fg = c.default.quartz }, -- (preferred) any constant
|
||||
String = { fg = c.default.green }, -- a string constant: "this is a string"
|
||||
Character = { fg = c.default.green }, -- a character constant: 'c', '\n'
|
||||
Number = { fg = c.default.fg }, -- a number constant: 234, 0xff
|
||||
Boolean = { fg = c.default.yellow, bold = config.bold }, -- a boolean constant: TRUE, false
|
||||
Float = { fg = c.default.yellow, bold = config.bold }, -- a floating point constant: 2.3e10
|
||||
Identifier = { fg = c.default["fg+1"] }, -- (preferred) any variable name
|
||||
Function = { fg = c.default.niagara }, -- function name (also: methods for classes)
|
||||
Statement = { fg = c.default.yellow }, -- (preferred) any statement
|
||||
Conditional = { fg = c.default.yellow, bold = config.bold }, -- if, then, else, endif, switch, etc.
|
||||
Repeat = { fg = c.default.yellow, bold = config.bold }, -- for, do, while, etc.
|
||||
Label = { fg = c.default.yellow, bold = config.bold }, -- case, default, etc.
|
||||
Operator = { fg = c.default.yellow }, -- "sizeof", "+", "*", etc.
|
||||
Keyword = { fg = c.default.yellow, bold = config.bold }, -- any other keyword
|
||||
Exception = { fg = c.default.yellow, bold = config.bold }, -- try, catch, throw
|
||||
PreProc = { fg = c.default.quartz }, -- (preferred) generic Preprocessor
|
||||
Include = { fg = c.default.quartz }, -- preprocessor #include
|
||||
Define = { fg = c.default.quartz }, -- preprocessor #define
|
||||
Macro = { fg = c.default.quartz }, -- same as Define
|
||||
PreCondit = { fg = c.default.quartz }, -- preprocessor #if, #else, #endif, etc.
|
||||
Type = { fg = c.default.quartz }, -- (preferred) int, long, char, etc.
|
||||
StorageClass = { fg = c.default.yellow, bold = config.bold }, -- static, register, volatile, etc.
|
||||
Structure = { fg = c.default.yellow, bold = config.bold }, -- struct, union, enum, etc.
|
||||
Typedef = { fg = c.default.yellow, bold = config.bold }, -- A typedef
|
||||
Special = { fg = c.default.yellow }, -- (preferred) any special symbol
|
||||
Constant = { fg = c.default.quartz:to_string() }, -- (preferred) any constant
|
||||
String = { fg = c.default.green:to_string() }, -- a string constant: "this is a string"
|
||||
Character = { fg = c.default.green:to_string() }, -- a character constant: 'c', '\n'
|
||||
Number = { fg = c.default.fg:to_string() }, -- a number constant: 234, 0xff
|
||||
Boolean = { fg = c.default.yellow:to_string(), bold = config.bold }, -- a boolean constant: TRUE, false
|
||||
Float = { fg = c.default.yellow:to_string(), bold = config.bold }, -- a floating point constant: 2.3e10
|
||||
Identifier = { fg = c.default["fg+1"]:to_string() }, -- (preferred) any variable name
|
||||
Function = { fg = c.default.niagara:to_string() }, -- function name (also: methods for classes)
|
||||
Statement = { fg = c.default.yellow:to_string() }, -- (preferred) any statement
|
||||
Conditional = { fg = c.default.yellow:to_string(), bold = config.bold }, -- if, then, else, endif, switch, etc.
|
||||
Repeat = { fg = c.default.yellow:to_string(), bold = config.bold }, -- for, do, while, etc.
|
||||
Label = { fg = c.default.yellow:to_string(), bold = config.bold }, -- case, default, etc.
|
||||
Operator = { fg = c.default.yellow:to_string() }, -- "sizeof", "+", "*", etc.
|
||||
Keyword = { fg = c.default.yellow:to_string(), bold = config.bold }, -- any other keyword
|
||||
Exception = { fg = c.default.yellow:to_string(), bold = config.bold }, -- try, catch, throw
|
||||
PreProc = { fg = c.default.quartz:to_string() }, -- (preferred) generic Preprocessor
|
||||
Include = { fg = c.default.quartz:to_string() }, -- preprocessor #include
|
||||
Define = { fg = c.default.quartz:to_string() }, -- preprocessor #define
|
||||
Macro = { fg = c.default.quartz:to_string() }, -- same as Define
|
||||
PreCondit = { fg = c.default.quartz:to_string() }, -- preprocessor #if, #else, #endif, etc.
|
||||
Type = { fg = c.default.quartz:to_string() }, -- (preferred) int, long, char, etc.
|
||||
StorageClass = { fg = c.default.yellow:to_string(), bold = config.bold }, -- static, register, volatile, etc.
|
||||
Structure = { fg = c.default.yellow:to_string(), bold = config.bold }, -- struct, union, enum, etc.
|
||||
Typedef = { fg = c.default.yellow:to_string(), bold = config.bold }, -- A typedef
|
||||
Special = { fg = c.default.yellow:to_string() }, -- (preferred) any special symbol
|
||||
-- SpecialChar = { }, -- special character in a constant
|
||||
-- Tag = { }, -- you can use CTRL-] on this
|
||||
-- Delimiter = { }, -- character that needs attention
|
||||
-- SpecialComment= { }, -- special things inside a comment
|
||||
-- Debug = { fg = c.default["fg+2"] }, -- debugging statements
|
||||
-- Debug = { fg = c.default["fg+2"]:to_string() }, -- debugging statements
|
||||
|
||||
Underlined = { underline = config.underline }, -- (preferred) text that stands out, HTML links
|
||||
Bold = { bold = config.bold },
|
||||
|
|
@ -145,17 +145,17 @@ function M.setup()
|
|||
-- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore|
|
||||
|
||||
-- Error = { fg = c.error }, -- (preferred) any erroneous construct
|
||||
Todo = { fg = c.default.bg, bg = c.default.yellow }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
|
||||
markdownHeadingDelimiter = { fg = c.default.niagara, bold = config.bold },
|
||||
markdownCode = { fg = c.default.green },
|
||||
markdownCodeBlock = { fg = c.default.green },
|
||||
Todo = { fg = c.default.bg:to_string(), bg = c.default.yellow:to_string() }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
|
||||
markdownHeadingDelimiter = { fg = c.default.niagara:to_string(), bold = config.bold },
|
||||
markdownCode = { fg = c.default.green:to_string() },
|
||||
markdownCodeBlock = { fg = c.default.green:to_string() },
|
||||
-- markdownH1 = { fg = c.magenta, bold = true },
|
||||
-- markdownH2 = { fg = c.blue, bold = true },
|
||||
-- markdownLinkText = { fg = c.blue, underline = true },
|
||||
markdownItalic = { fg = c.default.wisteria, italic = config.italic },
|
||||
markdownBold = { fg = c.default.yellow, bold = config.bold },
|
||||
markdownCodeDelimiter = { fg = c.default.brown, italic = config.italic },
|
||||
markdownError = { fg = c.default.fg, bg = c.default["bg+1"] },
|
||||
markdownItalic = { fg = c.default.wisteria:to_string(), italic = config.italic },
|
||||
markdownBold = { fg = c.default.yellow:to_string(), bold = config.bold },
|
||||
markdownCodeDelimiter = { fg = c.default.brown:to_string(), italic = config.italic },
|
||||
markdownError = { fg = c.default.fg:to_string(), bg = c.default["bg+1"]:to_string() },
|
||||
-- These groups are for the neovim tree-sitter highlights.
|
||||
-- As of writing, tree-sitter support is a WIP, group names may change.
|
||||
-- By default, most of these groups link to an appropriate Vim group,
|
||||
|
|
@ -164,15 +164,15 @@ function M.setup()
|
|||
|
||||
-- TSAnnotation = { }, -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
|
||||
-- TSAttribute = { }, -- (unstable) TODO: docs
|
||||
TSBoolean = { fg = c.default.quartz }, -- For booleans.
|
||||
TSCharacter = { fg = c.default.green }, -- For characters.
|
||||
TSComment = { fg = c.default.brown }, -- For comment blocks.
|
||||
TSBoolean = { fg = c.default.quartz:to_string() }, -- For booleans.
|
||||
TSCharacter = { fg = c.default.green:to_string() }, -- For characters.
|
||||
TSComment = { fg = c.default.brown:to_string() }, -- For comment blocks.
|
||||
-- TSNote = { fg = c.bg, bg = c.info },
|
||||
["@text.warning"] = { fg = c.default.red },
|
||||
["@text.danger"] = { fg = c.default.white, bg = c.default.red },
|
||||
["@text.warning"] = { fg = c.default.red:to_string() },
|
||||
["@text.danger"] = { fg = c.default.white:to_string(), bg = c.default.red:to_string() },
|
||||
-- ["@constructor"] = { fg = c.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
|
||||
TSConditional = { fg = c.default.yellow }, -- For keywords related to conditionnals.
|
||||
TSConstant = { fg = c.default.quartz }, -- For constants
|
||||
TSConditional = { fg = c.default.yellow:to_string() }, -- For keywords related to conditionnals.
|
||||
TSConstant = { fg = c.default.quartz:to_string() }, -- For constants
|
||||
-- TSConstBuiltin = { }, -- For constant that are built in the language: `nil` in Lua.
|
||||
-- TSConstMacro = { }, -- For constants that are defined by macros: `NULL` in C.
|
||||
-- TSError = { }, -- For syntax/parser errors.
|
||||
|
|
@ -197,12 +197,12 @@ function M.setup()
|
|||
-- ["@punctuation.delimiter"] = { fg = c.blue5 }, -- For delimiters ie: `.`
|
||||
-- ["@punctuation.bracket"] = { fg = c.fg_dark }, -- For brackets and parens.
|
||||
-- ["@punctuation.special"] = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before.
|
||||
TSRepeat = { fg = c.default.yellow }, -- For keywords related to loops.
|
||||
TSString = { fg = c.default.green }, -- For strings.
|
||||
TSRepeat = { fg = c.default.yellow:to_string() }, -- For keywords related to loops.
|
||||
TSString = { fg = c.default.green:to_string() }, -- For strings.
|
||||
-- ["@string.regex"] = { fg = c.blue6 }, -- For regexes.
|
||||
-- ["@string.escape"] = { fg = c.magenta }, -- For escape characters within a string.
|
||||
-- TSSymbol = { }, -- For identifiers referring to symbols or atoms.
|
||||
TSType = { fg = c.default.quartz }, -- For types.
|
||||
TSType = { fg = c.default.quartz:to_string() }, -- For types.
|
||||
-- TSTypeBuiltin = { }, -- For builtin types.
|
||||
-- ["@variable"] = { style = options.styles.variables }, -- Any variable name that does not have another highlight.
|
||||
-- ["@variable.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`.
|
||||
|
|
@ -216,7 +216,7 @@ function M.setup()
|
|||
-- TSStrike = { }, -- For strikethrough text.
|
||||
-- TSTitle = { }, -- Text that is part of a title.
|
||||
-- TSLiteral = { }, -- Literal text.
|
||||
TSURI = { fg = c.default.niagara, underline = config.underline }, -- Any URI like a link or email.
|
||||
TSURI = { fg = c.default.niagara:to_string(), underline = config.underline }, -- Any URI like a link or email.
|
||||
["@text.diff.add"] = { link = "DiffAdd" },
|
||||
["@text.diff.delete"] = { link = "DiffDelete" },
|
||||
["@text.diff.change"] = { link = "DiffChange" },
|
||||
|
|
@ -229,9 +229,9 @@ function M.setup()
|
|||
-- CmpItemAbbrMatch = { fg = c.blue1, bg = c.none },
|
||||
-- CmpItemAbbrMatchFuzzy = { fg = c.blue1, bg = c.none },
|
||||
|
||||
-- CmpItemMenu = { fg = c.default.white, bg = c.default["bg+4"] },
|
||||
-- CmpItemMenu = { fg = c.default.white:to_string(), bg = c.default["bg+4"]:to_string() },
|
||||
|
||||
-- CmpItemKindDefault = { fg = c.default.white, bg = c.default["bg+4"] },
|
||||
-- CmpItemKindDefault = { fg = c.default.white:to_string(), bg = c.default["bg+4"]:to_string() },
|
||||
|
||||
-- CmpItemKindKeyword = { fg = c.cyan, bg = c.none },
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,31 @@
|
|||
local Color = require("gruber-darker.color")
|
||||
local M = {}
|
||||
|
||||
---@class Palette
|
||||
---@type table<string, Color>
|
||||
M.default = {
|
||||
none = "NONE",
|
||||
fg = "#e4e4e4",
|
||||
["fg+1"] = "#f4f4ff",
|
||||
["fg+2"] = "#f5f5f5",
|
||||
white = "#ffffff",
|
||||
black = "#000000",
|
||||
["bg-1"] = "#101010",
|
||||
bg = "#181818",
|
||||
["bg+1"] = "#282828",
|
||||
["bg+2"] = "#453d41",
|
||||
["bg+3"] = "#484848",
|
||||
["bg+4"] = "#52494e",
|
||||
["red-1"] = "#c73c3f",
|
||||
red = "#f43841",
|
||||
["red+1"] = "#ff4f58",
|
||||
green = "#73d936",
|
||||
yellow = "#ffdd33",
|
||||
brown = "#cc8c3c",
|
||||
quartz = "#95a99f",
|
||||
["niagara-2"] = "#303540",
|
||||
["niagara-1"] = "#565f73",
|
||||
niagara = "#96a6c8",
|
||||
wisteria = "#9e95c7",
|
||||
none = Color.none(),
|
||||
fg = Color.new(0xe4e4e4),
|
||||
["fg+1"] = Color.new(0xf4f4ff),
|
||||
["fg+2"] = Color.new(0xf5f5f5),
|
||||
white = Color.new(0xffffff),
|
||||
black = Color.new(0x000000),
|
||||
["bg-1"] = Color.new(0x101010),
|
||||
bg = Color.new(0x181818),
|
||||
["bg+1"] = Color.new(0x282828),
|
||||
["bg+2"] = Color.new(0x453d41),
|
||||
["bg+3"] = Color.new(0x484848),
|
||||
["bg+4"] = Color.new(0x52494e),
|
||||
["red-1"] = Color.new(0xc73c3f),
|
||||
red = Color.new(0xf43841),
|
||||
["red+1"] = Color.new(0xff4f58),
|
||||
green = Color.new(0x73d936),
|
||||
yellow = Color.new(0xffdd33),
|
||||
brown = Color.new(0xcc8c3c),
|
||||
quartz = Color.new(0x95a99f),
|
||||
["niagara-2"] = Color.new(0x303540),
|
||||
["niagara-1"] = Color.new(0x565f73),
|
||||
niagara = Color.new(0x96a6c8),
|
||||
wisteria = Color.new(0x9e95c7),
|
||||
}
|
||||
|
||||
return M
|
||||
|
|
|
|||
Loading…
Reference in New Issue