From 24f696ec2384a00f86f055322fad1b2f25bcdb51 Mon Sep 17 00:00:00 2001 From: PunGrumpy <108584943+PunGrumpy@users.noreply.github.com> Date: Tue, 19 Mar 2024 13:56:48 +0700 Subject: [PATCH] feat(theme): update highlights --- lua/dullahan/theme.lua | 500 ++++++++++++++++++++++------------------- 1 file changed, 273 insertions(+), 227 deletions(-) diff --git a/lua/dullahan/theme.lua b/lua/dullahan/theme.lua index c06eb276..1a086779 100644 --- a/lua/dullahan/theme.lua +++ b/lua/dullahan/theme.lua @@ -26,68 +26,70 @@ function M.setup() theme.highlights = { Comment = { fg = c.base01, style = options.styles.comments }, -- any comment - ColorColumn = { bg = c.base2 }, -- used for the columns set with 'colorcolumn' - Conceal = { fg = c.blue300 }, -- placeholder characters substituted for concealed text (see 'conceallevel') + ColorColumn = { bg = c.base02 }, -- used for the columns set with 'colorcolumn' + Conceal = { fg = c.blue500 }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor = { fg = c.base03, bg = c.base0 }, -- character under the cursor lCursor = { fg = c.base03, bg = c.base00 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') CursorIM = { fg = c.base03, bg = c.base0 }, -- like Cursor, but used when in IME mode |CursorIM| CursorColumn = { bg = c.base02 }, -- Screen-column at the cursor, when 'cursorcolumn' is set. CursorLine = { bg = c.base03, sp = c.base1 }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. - Directory = { fg = c.blue300 }, -- directory names (and other special names in listings) - DiffAdd = { fg = c.green300, bg = c.base02, bold = true }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = c.yellow300, bg = c.base02, bold = true }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = c.red300, bg = c.base02, bold = true }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = c.blue300, bg = c.base02, bold = true }, -- diff mode: Changed text within a changed line |diff.txt| + Directory = { fg = c.blue500 }, -- directory names (and other special names in listings) + DiffAdd = { fg = c.green500, bg = c.base02, bold = true }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = c.yellow500, bg = c.base02, bold = true }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = c.red500, bg = c.base02, bold = true }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = c.blue500, bg = c.base02, bold = true }, -- diff mode: Changed text within a changed line |diff.txt| EndOfBuffer = { fg = c.base01 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. -- TermCursor = { }, -- cursor in a focused terminal -- TermCursorNC= { }, -- cursor in an unfocused terminal - ErrorMsg = { fg = c.red300, reverse = true }, -- error messages on the command line + ErrorMsg = { fg = c.red500, reverse = true }, -- error messages on the command line VertSplit = { fg = c.base00 }, -- the column separating vertically split windows WinSeparator = { fg = c.base02, bold = true }, -- the column separating vertically split windows Folded = { fg = c.base0, bg = c.base02, bold = true }, -- line used for closed folds FoldColumn = { fg = c.base0 }, -- 'foldcolumn' SignColumn = { fg = c.base0 }, -- column where |signs| are displayed SignColumnSB = { fg = c.base0 }, -- column where |signs| are displayed - Substitute = { fg = c.base04, bg = c.red300 }, -- |:substitute| replacement text highlighting - LineNr = { fg = c.yellow500, bg = options.transparent and c.none or c.bg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - CursorLineNr = { fg = c.orange300, sp = c.base1 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - MatchParen = { fg = c.red100, bg = c.red300, bold = true }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| - ModeMsg = { fg = c.blue300 }, -- 'showmode' message (e.g., "-- INSERT -- ") + Substitute = { fg = c.base04, bg = c.red500 }, -- |:substitute| replacement text highlighting + LineNr = { fg = c.yellow700, bg = options.transparent and c.none or c.bg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr = { fg = c.orange500, sp = c.base1 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + MatchParen = { fg = c.red100, bg = c.red500, bold = true }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + ModeMsg = { fg = c.blue500 }, -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea = { fg = c.base01 }, -- Area for messages and cmdline -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg = { fg = c.blue300 }, -- |more-prompt| + MoreMsg = { fg = c.blue500 }, -- |more-prompt| NonText = { fg = c.base00, bold = true }, -- '@' 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.base0, bg = options.transparent and c.none or c.bg }, -- normal text NormalNC = { fg = c.base00, bg = options.transparent and c.none or options.dim_inactive and c.base04 or c.bg }, -- normal text in non-current windows NormalSB = { fg = c.base01, bg = c.bg_sidebar }, -- normal text in sidebar NormalFloat = { fg = c.base0, bg = c.bg_float }, -- Normal text in floating windows. - FloatBorder = { fg = c.yellow500, bg = c.bg_float }, + FloatBorder = { fg = c.yellow700, bg = c.bg_float }, FloatTitle = { fg = c.base2, bg = c.bg_float }, Pmenu = { fg = c.base0, bg = c.base02 }, -- Popup menu: normal item. PmenuSel = { fg = c.base01, bg = c.base2, reverse = true }, -- Popup menu: selected item. PmenuSbar = { fg = c.base02, reverse = true }, -- Popup menu: scrollbar. PmenuThumb = { fg = c.base0, reverse = true }, -- Popup menu: Thumb of the scrollbar. - Question = { fg = c.cyan300, bold = true }, -- |hit-enter| prompt and yes/no questions - QuickFixLine = { bg = c.blue500, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search = { fg = c.yellow300, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch = { fg = c.orange300, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Question = { fg = c.cyan500, bold = true }, -- |hit-enter| prompt and yes/no questions + QuickFixLine = { bg = c.blue700, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search = { fg = c.yellow500, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch = { fg = c.orange500, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" CurSearch = { link = "IncSearch" }, SpecialKey = { fg = c.base00 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| - SpellBad = { sp = c.red300, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. - SpellCap = { sp = c.violet300, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. - SpellLocal = { sp = c.cyan300, 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 = { sp = c.yellow300, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + SpellBad = { sp = c.red500, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellCap = { sp = c.violet500, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellLocal = { sp = c.cyan500, 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 = { sp = c.yellow500, 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.base1, bg = c.base03 }, -- status line of current window StatusLineNC = { fg = c.base0, bg = c.base04 }, -- 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 = { fg = c.base0, bg = c.base02, sp = c.base0 }, -- tab pages line, not active tab page label TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels - TabLineSel = { fg = c.yellow300, bg = c.bg }, -- tab pages line, active tab page label - Title = { fg = c.orange300, bold = true }, -- titles for output from ":set all", ":autocmd" etc. + TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label + Title = { fg = c.orange500, bold = true }, -- titles for output from ":set all", ":autocmd" etc. Visual = { bg = c.base03, reverse = true }, -- Visual mode selection VisualNOS = { bg = c.base03, reverse = true }, -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg = { fg = c.orange300, bold = true }, -- warning messages + WarningMsg = { fg = c.orange500, bold = true }, -- warning messages Whitespace = { fg = c.base01 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' WildMenu = { fg = c.base2, bg = c.base02, reverse = true }, -- current match in 'wildmenu' completion + WinBar = { link = "StatusLine" }, -- window bar + WinBarNC = { link = "StatusLineNC" }, -- window bar in inactive windows -- These groups are not listed as default vim groups, -- but they are defacto standard group names for syntax highlighting. @@ -95,41 +97,41 @@ function M.setup() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant = { fg = c.cyan300 }, -- (preferred) any constant - String = { fg = c.cyan300 }, -- a string constant: "this is a string" + Constant = { fg = c.cyan500 }, -- (preferred) any constant + String = { fg = c.cyan500 }, -- a string constant: "this is a string" Character = { link = "Constant" }, -- a character constant: 'c', '\n' -- Number = { }, -- a number constant: 234, 0xff -- Boolean = { }, -- a boolean constant: TRUE, false -- Float = { }, -- a floating point constant: 2.3e10 - Identifier = { fg = c.blue300, style = options.styles.variables }, -- (preferred) any variable name - Function = { fg = c.blue300, style = options.styles.functions }, -- function name (also: methods for classes) + Identifier = { fg = c.blue500, style = options.styles.variables }, -- (preferred) any variable name + Function = { fg = c.blue500, style = options.styles.functions }, -- function name (also: methods for classes) - Statement = { fg = c.green300 }, -- (preferred) any statement + Statement = { fg = c.green500 }, -- (preferred) any statement -- Conditional = { }, -- if, then, else, endif, switch, etc. -- Repeat = { }, -- for, do, while, etc. -- Label = { }, -- case, default, etc. - Operator = { fg = c.green300 }, -- "sizeof", "+", "*", etc. - Keyword = { fg = c.green300, style = options.styles.keywords }, -- any other keyword + Operator = { fg = c.green500 }, -- "sizeof", "+", "*", etc. + Keyword = { fg = c.green500, style = options.styles.keywords }, -- any other keyword -- Exception = { }, -- try, catch, throw - PreProc = { fg = c.red300 }, -- (preferred) generic Preprocessor + PreProc = { fg = c.red500 }, -- (preferred) generic Preprocessor -- Include = { }, -- preprocessor #include -- Define = { }, -- preprocessor #define -- Macro = { }, -- same as Define -- PreCondit = { }, -- preprocessor #if, #else, #endif, etc. - Type = { fg = c.yellow300 }, -- (preferred) int, long, char, etc. + Type = { fg = c.yellow500 }, -- (preferred) int, long, char, etc. -- StorageClass = { }, -- static, register, volatile, etc. -- Structure = { }, -- struct, union, enum, etc. -- Typedef = { }, -- A typedef - Special = { fg = c.orange300 }, -- (preferred) any special symbol + Special = { fg = c.orange500 }, -- (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.orange300 }, -- debugging statements + Debug = { fg = c.orange500 }, -- debugging statements Underlined = { underline = true }, -- (preferred) text that stands out, HTML links Bold = { bold = true }, @@ -138,33 +140,35 @@ function M.setup() -- ("Ignore", below, may be invisible...) -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| - Error = { fg = c.red300 }, -- (preferred) any erroneous construct - Todo = { fg = c.magenta300, bold = true }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Error = { fg = c.red500 }, -- (preferred) any erroneous construct + Todo = { fg = c.magenta500, bold = true }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = c.base0 }, - qfFileName = { fg = c.violet300 }, + qfFileName = { fg = c.violet500 }, - htmlH1 = { fg = c.magenta300, bold = true }, - htmlH2 = { fg = c.blue300, bold = true }, + htmlH1 = { fg = c.magenta500, bold = true }, + htmlH2 = { fg = c.blue500, bold = true }, -- mkdHeading = { fg = c.orange, bold = true }, - mkdCode = { bg = c.green700 }, - mkdCodeDelimiter = { fg = c.base0, bg = c.green500 }, - mkdCodeStart = { fg = c.orange300, bold = true }, - mkdCodeEnd = { fg = c.orange300, bold = true }, + mkdCode = { bg = c.green900 }, + mkdCodeDelimiter = { fg = c.base0, bg = c.green700 }, + mkdCodeStart = { fg = c.orange500, bold = true }, + mkdCodeEnd = { fg = c.orange500, bold = true }, -- mkdLink = { fg = c.blue, underline = true }, - markdownHeadingDelimiter = { fg = c.orange300, bold = true }, - markdownCode = { fg = c.yellow300, bg = c.green700 }, - markdownCodeBlock = { fg = c.yellow300, bg = c.green700 }, - markdownH1 = { fg = c.magenta300, bold = true }, - markdownH2 = { fg = c.violet300, bold = true }, - markdownLinkText = { fg = c.blue300, underline = true }, + markdownHeadingDelimiter = { fg = c.orange500, bold = true }, + markdownCode = { fg = c.yellow500, bg = c.green900 }, + markdownCodeBlock = { fg = c.yellow500, bg = c.green900 }, + markdownH1 = { fg = c.magenta500, bold = true }, + markdownH2 = { fg = c.violet500, bold = true }, + markdownLinkText = { fg = c.blue500, underline = true }, - ["helpCommand"] = { fg = c.blue300, bg = c.base01 }, + ["helpCommand"] = { fg = c.blue500, bg = c.blue900 }, debugPC = { bg = c.bg_sidebar }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { fg = c.blue300, bg = c.blue500 }, -- used for breakpoint colors in terminal-debug + debugBreakpoint = { fg = c.blue300, bg = c.blue700 }, -- used for breakpoint colors in terminal-debug + + dosIniLabel = { link = "@property" }, -- These groups are for the native LSP client. Some other LSP clients may -- use these groups, or use their own. Consult your LSP client's @@ -179,10 +183,10 @@ function M.setup() DiagnosticHint = { fg = c.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticUnnecessary = { fg = c.base00 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticVirtualTextError = { bg = c.red700, fg = c.red300 }, -- Used for "Error" diagnostic virtual text - DiagnosticVirtualTextWarn = { bg = c.yellow700, fg = c.yellow300 }, -- Used for "Warning" diagnostic virtual text - DiagnosticVirtualTextInfo = { bg = c.blue700, fg = c.blue300 }, -- Used for "Information" diagnostic virtual text - DiagnosticVirtualTextHint = { bg = c.cyan700, fg = c.cyan300 }, -- Used for "Hint" diagnostic virtual text + DiagnosticVirtualTextError = { bg = c.red900, fg = c.red500 }, -- Used for "Error" diagnostic virtual text + DiagnosticVirtualTextWarn = { bg = c.yellow900, fg = c.yellow500 }, -- Used for "Warning" diagnostic virtual text + DiagnosticVirtualTextInfo = { bg = c.blue900, fg = c.blue500 }, -- Used for "Information" diagnostic virtual text + DiagnosticVirtualTextHint = { bg = c.cyan900, fg = c.cyan500 }, -- Used for "Hint" diagnostic virtual text DiagnosticUnderlineError = { undercurl = true, sp = c.error }, -- Used to underline "Error" diagnostics DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning }, -- Used to underline "Warning" diagnostics @@ -191,91 +195,150 @@ function M.setup() LspSignatureActiveParameter = { bg = c.base03, bold = true }, LspCodeLens = { fg = c.base01 }, - LspInlayHint = { bg = c.blue300, fg = c.base01 }, + LspInlayHint = { bg = c.violet900, fg = c.violet500 }, LspInfoBorder = { fg = c.base02, bg = c.bg_float }, - DapStoppedLine = { bg = c.yellow500 }, -- Used for "Warning" diagnostic virtual text + DapStoppedLine = { bg = c.yellow700 }, -- Used for "Warning" diagnostic virtual text -- These groups are for the Neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. + ["@annotation"] = { link = "PreProc" }, + ["@attribute"] = { link = "PreProc" }, + ["@boolean"] = { link = "Boolean" }, + ["@character"] = { link = "Character" }, + ["@character.special"] = { link = "SpecialChar" }, + ["@comment"] = { link = "Comment" }, + ["@keyword.conditional"] = { link = "Conditional" }, + ["@constant"] = { link = "Constant" }, + ["@constant.builtin"] = { link = "Special" }, + ["@constant.macro"] = { link = "Define" }, + ["@keyword.debug"] = { link = "Debug" }, + ["@keyword.directive.define"] = { link = "Define" }, + ["@keyword.exception"] = { link = "Exception" }, + ["@number.float"] = { link = "Float" }, + ["@function"] = { link = "Function" }, + ["@function.builtin"] = { link = "Special" }, + ["@function.call"] = { link = "@function" }, + ["@function.macro"] = { link = "Macro" }, + ["@keyword.import"] = { link = "Include" }, + ["@keyword.coroutine"] = { link = "@keyword" }, + ["@keyword.operator"] = { link = "@operator" }, + ["@keyword.return"] = { link = "@keyword" }, + ["@function.method"] = { link = "Function" }, + ["@function.method.call"] = { link = "@function.method" }, + ["@namespace.builtin"] = { link = "@variable.builtin" }, + ["@none"] = {}, + ["@number"] = { link = "Number" }, + ["@keyword.directive"] = { link = "PreProc" }, + ["@keyword.repeat"] = { link = "Repeat" }, + ["@keyword.storage"] = { link = "StorageClass" }, + ["@string"] = { link = "String" }, + ["@markup.link.label"] = { link = "SpecialChar" }, + ["@markup.link.label.symbol"] = { link = "Identifier" }, + ["@tag"] = { link = "Label" }, + ["@tag.attribute"] = { link = "@property" }, + ["@tag.delimiter"] = { link = "Delimiter" }, + ["@markup"] = { link = "@none" }, + ["@markup.environment"] = { link = "Macro" }, + ["@markup.environment.name"] = { link = "Type" }, + ["@markup.raw"] = { link = "String" }, + ["@markup.math"] = { link = "Special" }, + ["@markup.strong"] = { bold = true }, + ["@markup.emphasis"] = { italic = true }, + ["@markup.strikethrough"] = { strikethrough = true }, + ["@markup.underline"] = { underline = true }, + ["@markup.heading"] = { link = "Title" }, + ["@comment.note"] = { fg = c.hint }, + ["@comment.error"] = { fg = c.error }, + ["@comment.hint"] = { fg = c.hint }, + ["@comment.info"] = { fg = c.info }, + ["@comment.warning"] = { fg = c.warning }, + ["@comment.todo"] = { fg = c.todo }, + ["@markup.link.url"] = { link = "Underlined" }, + ["@type"] = { link = "Type" }, + ["@type.definition"] = { link = "Typedef" }, + ["@type.qualifier"] = { link = "@keyword" }, --- Misc -- TODO: -- ["@comment.documentation"] = { }, - ["@operator"] = { fg = c.green300 }, -- For any operator: `+`, but also `->` and `*` in C. + ["@operator"] = { fg = c.green500 }, -- For any operator: `+`, but also `->` and `*` in C. --- Punctuation - ["@punctuation.delimiter"] = { fg = c.green300 }, -- For delimiters ie: `.` - ["@punctuation.bracket"] = { fg = c.orange300 }, -- For brackets and parens. - ["@punctuation.special"] = { fg = c.orange300 }, -- For special punctutation that does not fall in the catagories before. - ["@punctuation.special.markdown"] = { fg = c.orange300, bold = true }, + ["@punctuation.delimiter"] = { fg = c.green500 }, -- For delimiters ie: `.` + ["@punctuation.bracket"] = { fg = c.orange500 }, -- For brackets and parens. + ["@punctuation.special"] = { fg = c.orange500 }, -- For special punctutation that does not fall in the catagories before. + ["@punctuation.special.markdown"] = { fg = c.orange500, bold = true }, + ["@markup.list"] = { fg = c.blue500 }, -- For special punctutation that does not fall in the catagories before. + ["@markup.list.markdown"] = { fg = c.orange500, bold = true }, --- Literals - ["@string.documentation"] = { fg = c.cyan300 }, - ["@string.regex"] = { fg = c.cyan300 }, -- For regexes. - ["@string.escape"] = { fg = c.orange500 }, -- For escape characters within a string. + ["@string.documentation"] = { fg = c.cyan500 }, + ["@string.regexp"] = { fg = c.cyan300 }, -- For regexes. + ["@string.escape"] = { fg = c.orange700 }, -- For escape characters within a string. --- Functions - ["@constructor"] = { fg = c.orange300 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - ["@parameter"] = { fg = c.orange300 }, -- For parameters of a function. - -- TODO: - -- ["@parameter.builtin"] = {}, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] + ["@constructor"] = { fg = c.orange500 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + ["@variable.parameter"] = { fg = c.orange500 }, -- For parameters of a function. + ["@variable.parameter.builtin"] = { fg = c.yellow300 }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] --- Keywords - ["@keyword"] = { fg = c.green300, style = options.styles.keywords }, -- For keywords that don't fall in previous categories. - -- TODO: - -- ["@keyword.coroutine"] = { }, -- For keywords related to coroutines. - ["@keyword.function"] = { fg = c.green300, style = options.styles.functions }, -- For keywords used to define a fuction. + ["@keyword"] = { fg = c.green500, style = options.styles.keywords }, -- For keywords that don't fall in previous categories. + ["@keyword.function"] = { fg = c.green500, style = options.styles.functions }, -- For keywords used to define a fuction. - ["@label"] = { fg = c.green300 }, -- For labels: `label:` in C and `:label:` in Lua. + ["@label"] = { fg = c.green500 }, -- For labels: `label:` in C and `:label:` in Lua. --- Types ["@type.builtin"] = { link = "Type" }, - ["@field"] = { link = "Identifier" }, -- For fields. + ["@variable.member"] = { fg = c.cyan500 }, -- For fields. ["@property"] = { link = "Identifier" }, --- Identifiers ["@variable"] = { fg = c.base0, style = options.styles.variables }, -- Any variable name that does not have another highlight. - ["@variable.builtin"] = { fg = c.orange300 }, -- Variable names that are defined by the languages, like `this` or `self`. + ["@variable.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. + ["@module.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. --- Text - ["@text.literal.markdown"] = { fg = c.red300 }, - ["@text.literal.markdown_inline"] = { fg = c.yellow300, bg = c.green700 }, - ["@text.reference"] = { fg = c.blue300, underline = true }, + -- ["@markup.raw.markdown"] = { fg = c.blue }, + ["@markup.raw.markdown_inline"] = { fg = c.yellow500, bg = c.green900 }, + ["@markup.link"] = { fg = c.blue500, underline = true }, - ["@text.todo.unchecked"] = { fg = c.yellow300 }, -- For brackets and parens. - ["@text.todo.checked"] = { fg = c.green300 }, -- For brackets and parens. - ["@text.warning"] = { fg = c.yellow700, bg = c.yellow300 }, - ["@text.danger"] = { fg = c.red700, bg = c.red300 }, + ["@markup.list.unchecked"] = { fg = c.yellow500 }, -- For brackets and parens. + ["@markup.list.checked"] = { fg = c.green500 }, -- For brackets and parens. - ["@text.diff.add"] = { link = "DiffAdd" }, - ["@text.diff.delete"] = { link = "DiffDelete" }, + ["@diff.plus"] = { link = "DiffAdd" }, + ["@diff.minus"] = { link = "DiffDelete" }, + ["@diff.delta"] = { link = "DiffChange" }, - ["@namespace"] = { fg = c.blue300, style = options.styles.variables }, + ["@module"] = { link = "Include" }, -- tsx - ["@tag.tsx"] = { fg = c.green300 }, - ["@constructor.tsx"] = { fg = c.blue300 }, - ["@tag.delimiter.tsx"] = { fg = c.orange300 }, + ["@tag.tsx"] = { fg = c.green500 }, + ["@constructor.tsx"] = { fg = c.blue500 }, + ["@tag.delimiter.tsx"] = { fg = c.orange500 }, -- LSP Semantic Token Groups ["@lsp.type.boolean"] = { link = "@boolean" }, ["@lsp.type.builtinType"] = { link = "@type.builtin" }, ["@lsp.type.comment"] = { link = "@comment" }, + ["@lsp.type.decorator"] = { link = "@attribute" }, + ["@lsp.type.deriveHelper"] = { link = "@attribute" }, ["@lsp.type.enum"] = { link = "@type" }, ["@lsp.type.enumMember"] = { link = "@constant" }, ["@lsp.type.escapeSequence"] = { link = "@string.escape" }, - ["@lsp.type.formatSpecifier"] = { link = "@punctuation.special" }, - ["@lsp.type.interface"] = { fg = c.blue300 }, + ["@lsp.type.formatSpecifier"] = { link = "@markup.list" }, + ["@lsp.type.generic"] = { link = "@variable" }, + ["@lsp.type.interface"] = { fg = c.blue500 }, ["@lsp.type.keyword"] = { link = "@keyword" }, - ["@lsp.type.namespace"] = { link = "@namespace" }, + ["@lsp.type.lifetime"] = { link = "@keyword.storage" }, + ["@lsp.type.namespace"] = { link = "@module" }, ["@lsp.type.number"] = { link = "@number" }, ["@lsp.type.operator"] = { link = "@operator" }, - ["@lsp.type.parameter"] = { link = "@parameter" }, + ["@lsp.type.parameter"] = { link = "@variable.parameter" }, ["@lsp.type.property"] = { link = "@property" }, ["@lsp.type.selfKeyword"] = { link = "@variable.builtin" }, - ["@lsp.type.string.rust"] = { link = "@string" }, + ["@lsp.type.selfTypeKeyword"] = { link = "@variable.builtin" }, + ["@lsp.type.string"] = { link = "@string" }, ["@lsp.type.typeAlias"] = { link = "@type.definition" }, ["@lsp.type.unresolvedReference"] = { undercurl = true, sp = c.error }, ["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables @@ -284,24 +347,29 @@ function M.setup() ["@lsp.typemod.enumMember.defaultLibrary"] = { link = "@constant.builtin" }, ["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" }, ["@lsp.typemod.keyword.async"] = { link = "@keyword.coroutine" }, + ["@lsp.typemod.keyword.injected"] = { link = "@keyword" }, ["@lsp.typemod.macro.defaultLibrary"] = { link = "@function.builtin" }, ["@lsp.typemod.method.defaultLibrary"] = { link = "@function.builtin" }, ["@lsp.typemod.operator.injected"] = { link = "@operator" }, ["@lsp.typemod.string.injected"] = { link = "@string" }, - ["@lsp.typemod.type.defaultLibrary"] = { fg = c.blue300 }, + ["@lsp.typemod.struct.defaultLibrary"] = { link = "@type.builtin" }, + ["@lsp.typemod.type.defaultLibrary"] = { fg = c.blue500 }, + ["@lsp.typemod.typeAlias.defaultLibrary"] = { fg = c.blue500 }, + ["@lsp.typemod.variable.callable"] = { link = "@function" }, ["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" }, ["@lsp.typemod.variable.injected"] = { link = "@variable" }, + ["@lsp.typemod.variable.static"] = { link = "@constant" }, -- NOTE: maybe add these with distinct highlights? -- ["@lsp.typemod.variable.globalScope"] (global variables) -- ts-rainbow - rainbowcol1 = { fg = c.red300 }, - rainbowcol2 = { fg = c.orange300 }, - rainbowcol3 = { fg = c.yellow300 }, - rainbowcol4 = { fg = c.green300 }, - rainbowcol5 = { fg = c.cyan300 }, - rainbowcol6 = { fg = c.blue300 }, - rainbowcol7 = { fg = c.magenta300 }, + rainbowcol1 = { fg = c.red500 }, + rainbowcol2 = { fg = c.orange500 }, + rainbowcol3 = { fg = c.yellow500 }, + rainbowcol4 = { fg = c.green500 }, + rainbowcol5 = { fg = c.cyan500 }, + rainbowcol6 = { fg = c.blue500 }, + rainbowcol7 = { fg = c.magenta500 }, -- ts-rainbow2 (maintained fork) TSRainbowRed = { fg = c.red }, @@ -309,7 +377,7 @@ function M.setup() TSRainbowYellow = { fg = c.yellow }, TSRainbowGreen = { fg = c.green }, TSRainbowBlue = { fg = c.blue }, - TSRainbowViolet = { fg = c.violet300 }, + TSRainbowViolet = { fg = c.violet500 }, TSRainbowCyan = { fg = c.cyan }, -- rainbow-delimiters @@ -323,66 +391,66 @@ function M.setup() -- LspTrouble TroubleText = { fg = c.base0 }, - TroubleCount = { fg = c.magenta300 }, + TroubleCount = { fg = c.magenta500 }, TroubleNormal = { fg = c.base0 }, -- Illuminate - illuminatedWord = { bg = c.violet700 }, - illuminatedCurWord = { bg = c.violet700 }, - IlluminatedWordText = { bg = c.violet700 }, - IlluminatedWordRead = { bg = c.magenta700 }, - IlluminatedWordWrite = { bg = c.magenta700 }, + illuminatedWord = { bg = c.violet900 }, + illuminatedCurWord = { bg = c.violet900 }, + IlluminatedWordText = { bg = c.violet900 }, + IlluminatedWordRead = { bg = c.magenta900 }, + IlluminatedWordWrite = { bg = c.magenta900 }, -- diff - diffAdded = { fg = c.green300 }, - diffRemoved = { fg = c.red300 }, - diffChanged = { fg = c.yellow300 }, - diffOldFile = { fg = c.violet300 }, - diffNewFile = { fg = c.orange300 }, - diffFile = { fg = c.blue300 }, + diffAdded = { fg = c.green500 }, + diffRemoved = { fg = c.red500 }, + diffChanged = { fg = c.yellow500 }, + diffOldFile = { fg = c.violet500 }, + diffNewFile = { fg = c.orange500 }, + diffFile = { fg = c.blue500 }, diffLine = { fg = c.base01 }, - diffIndexLine = { fg = c.magenta300 }, + diffIndexLine = { fg = c.magenta500 }, -- Neogit - NeogitBranch = { fg = c.magenta300 }, - NeogitRemote = { fg = c.violet300 }, + NeogitBranch = { fg = c.magenta500 }, + NeogitRemote = { fg = c.violet500 }, NeogitHunkHeader = { fg = c.base0, bg = c.base02 }, - NeogitHunkHeaderHighlight = { fg = c.blue300, bg = c.base00 }, + NeogitHunkHeaderHighlight = { fg = c.blue500, bg = c.base02 }, NeogitDiffContextHighlight = { fg = c.base00, bg = c.base02 }, - NeogitDiffDeleteHighlight = { fg = c.red300, bg = c.red700 }, - NeogitDiffAddHighlight = { fg = c.green300, bg = c.green700 }, + NeogitDiffDeleteHighlight = { fg = c.red500, bg = c.red900 }, + NeogitDiffAddHighlight = { fg = c.green500, bg = c.green900 }, -- Neotest - NeotestPassed = { fg = c.green300 }, - NeotestRunning = { fg = c.yellow300 }, - NeotestFailed = { fg = c.red300 }, - NeotestSkipped = { fg = c.blue300 }, + NeotestPassed = { fg = c.green500 }, + NeotestRunning = { fg = c.yellow500 }, + NeotestFailed = { fg = c.red500 }, + NeotestSkipped = { fg = c.blue500 }, NeotestTest = { fg = c.base00 }, - NeotestNamespace = { fg = c.cyan300 }, - NeotestFocused = { fg = c.yellow300 }, - NeotestFile = { fg = c.cyan300 }, - NeotestDir = { fg = c.blue300 }, - NeotestBorder = { fg = c.blue300 }, + NeotestNamespace = { fg = c.cyan500 }, + NeotestFocused = { fg = c.yellow500 }, + NeotestFile = { fg = c.cyan500 }, + NeotestDir = { fg = c.blue500 }, + NeotestBorder = { fg = c.blue500 }, NeotestIndent = { fg = c.base00 }, NeotestExpandMarker = { fg = c.base0 }, - NeotestAdapterName = { fg = c.violet300, bold = true }, - NeotestWinSelect = { fg = c.blue300 }, - NeotestMarked = { fg = c.blue300 }, - NeotestTarget = { fg = c.blue300 }, + NeotestAdapterName = { fg = c.violet500, bold = true }, + NeotestWinSelect = { fg = c.blue500 }, + NeotestMarked = { fg = c.blue500 }, + NeotestTarget = { fg = c.blue500 }, --[[ NeotestUnknown = {}, ]] -- GitGutter - GitGutterAdd = { fg = c.green300 }, -- diff mode: Added line |diff.txt| - GitGutterChange = { fg = c.yellow300 }, -- diff mode: Changed line |diff.txt| - GitGutterDelete = { fg = c.red300 }, -- diff mode: Deleted line |diff.txt| - GitGutterAddLineNr = { fg = c.green300 }, - GitGutterChangeLineNr = { fg = c.yellow300 }, - GitGutterDeleteLineNr = { fg = c.red300 }, + GitGutterAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| + GitGutterChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| + GitGutterDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| + GitGutterAddLineNr = { fg = c.green500 }, + GitGutterChangeLineNr = { fg = c.yellow500 }, + GitGutterDeleteLineNr = { fg = c.red500 }, -- GitSigns - GitSignsAdd = { fg = c.green300 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = c.yellow300 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = c.red300 }, -- diff mode: Deleted line |diff.txt| + GitSignsAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| -- Telescope TelescopeBorder = { fg = c.base02, bg = c.bg_float }, @@ -396,11 +464,11 @@ function M.setup() }, NvimTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, NvimTreeRootFolder = { fg = c.blue, bold = true }, - NvimTreeGitDirty = { fg = c.yellow300 }, - NvimTreeGitNew = { fg = c.green300 }, - NvimTreeGitDeleted = { fg = c.red300 }, + NvimTreeGitDirty = { fg = c.yellow500 }, + NvimTreeGitNew = { fg = c.green500 }, + NvimTreeGitDeleted = { fg = c.red500 }, NvimTreeOpenedFile = { bg = c.bg_highlight }, - NvimTreeSpecialFile = { fg = c.violet300, underline = true }, + NvimTreeSpecialFile = { fg = c.violet500, underline = true }, NvimTreeIndentMarker = { fg = c.base02 }, NvimTreeImageFile = { fg = c.base00 }, NvimTreeSymlink = { fg = c.blue }, @@ -415,7 +483,7 @@ function M.setup() FernBranchText = { fg = c.blue }, -- glyph palette - GlyphPalette1 = { fg = c.red300 }, + GlyphPalette1 = { fg = c.red500 }, GlyphPalette2 = { fg = c.green }, GlyphPalette3 = { fg = c.yellow }, GlyphPalette4 = { fg = c.blue }, @@ -428,6 +496,9 @@ function M.setup() DashboardHeader = { fg = c.blue }, DashboardCenter = { fg = c.magenta }, DashboardFooter = { fg = c.yellow, italic = true }, + DashboardKey = { fg = c.orange500 }, + DashboardDesc = { fg = c.cyan500 }, + DashboardIcon = { fg = c.cyan500, bold = true }, -- Alpha AlphaShortcut = { fg = c.orange }, @@ -443,7 +514,7 @@ function M.setup() WhichKeySeperator = { fg = c.base01 }, WhichKeySeparator = { fg = c.base01 }, WhichKeyFloat = { bg = c.bg_sidebar }, - WhichKeyValue = { fg = c.violet300 }, + WhichKeyValue = { fg = c.violet500 }, -- LspSaga DiagnosticWarning = { link = "DiagnosticWarn" }, @@ -458,13 +529,13 @@ function M.setup() LspSagaCodeActionBorder = { fg = c.blue }, LspSagaFinderSelection = { fg = c.base03 }, LspSagaCodeActionTitle = { fg = c.cyan }, - LspSagaCodeActionContent = { fg = c.violet300 }, + LspSagaCodeActionContent = { fg = c.violet500 }, LspSagaSignatureHelpBorder = { fg = c.red }, - ReferencesCount = { fg = c.violet300 }, - DefinitionCount = { fg = c.violet300 }, + ReferencesCount = { fg = c.violet500 }, + DefinitionCount = { fg = c.violet500 }, DefinitionIcon = { fg = c.blue }, ReferencesIcon = { fg = c.blue }, - TargetWord = { fg = c.cyan300 }, + TargetWord = { fg = c.cyan500 }, -- NeoVim healthError = { fg = c.error }, @@ -472,7 +543,7 @@ function M.setup() healthWarning = { fg = c.warning }, -- BufferLine - BufferLineIndicatorSelected = { fg = c.yellow300 }, + BufferLineIndicatorSelected = { fg = c.yellow500 }, -- Barbar BufferCurrent = { bg = c.bg, fg = c.fg }, @@ -505,18 +576,18 @@ function M.setup() BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning }, BufferVisibleSign = { bg = c.bg_statusline, fg = c.info }, BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red }, - BufferInactive = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.violet300, 0.8) }, + BufferInactive = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.violet500, 0.8) }, BufferInactiveERROR = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.error, 0.8) }, BufferInactiveHINT = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.hint, 0.8) }, -- BufferInactiveIcon = { bg = c.bg_statusline, fg = util.darken(c., 0.1) }, BufferInactiveINFO = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.info, 0.8) }, BufferInactiveWARN = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.warning, 0.8) }, - BufferInactiveIndex = { bg = util.darken(c.bg_highlight, 0.4), fg = c.violet300 }, + BufferInactiveIndex = { bg = util.darken(c.bg_highlight, 0.4), fg = c.violet500 }, BufferInactiveMod = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.warning, 0.8) }, BufferInactiveSign = { bg = util.darken(c.bg_highlight, 0.4), fg = c.bg }, BufferInactiveTarget = { bg = util.darken(c.bg_highlight, 0.4), fg = c.red }, - BufferOffset = { bg = c.bg_statusline, fg = c.violet300 }, - BufferTabpageFill = { bg = util.darken(c.bg_highlight, 0.8), fg = c.violet300 }, + BufferOffset = { bg = c.bg_statusline, fg = c.violet500 }, + BufferTabpageFill = { bg = util.darken(c.bg_highlight, 0.8), fg = c.violet500 }, BufferTabpages = { bg = c.bg_statusline, fg = c.none }, -- Sneak @@ -524,35 +595,35 @@ function M.setup() SneakScope = { bg = c.base03 }, -- Hop - HopNextKey = { fg = c.magenta300, bold = true }, - HopNextKey1 = { fg = c.violet300, bold = true }, - HopNextKey2 = { fg = c.violet500 }, + HopNextKey = { fg = c.magenta500, bold = true }, + HopNextKey1 = { fg = c.violet500, bold = true }, + HopNextKey2 = { fg = c.violet700 }, HopUnmatched = { fg = c.base01 }, - TSNodeKey = { fg = c.magenta300, bold = true }, + TSNodeKey = { fg = c.magenta500, bold = true }, TSNodeUnmatched = { fg = c.base01 }, - LeapMatch = { bg = c.magenta300, fg = c.fg, bold = true }, - LeapLabelPrimary = { fg = c.magenta300, bold = true }, + LeapMatch = { bg = c.magenta500, fg = c.fg, bold = true }, + LeapLabelPrimary = { fg = c.magenta500, bold = true }, LeapLabelSecondary = { fg = c.cyan, bold = true }, LeapBackdrop = { fg = c.base01 }, FlashBackdrop = { fg = c.base01 }, - FlashLabel = { bg = c.magenta300, bold = true, fg = c.fg }, + FlashLabel = { bg = c.magenta500, bold = true, fg = c.fg }, LightspeedGreyWash = { fg = c.base01 }, -- LightspeedCursor = { link = "Cursor" }, - LightspeedLabel = { fg = c.magenta300, bold = true, underline = true }, + LightspeedLabel = { fg = c.magenta500, bold = true, underline = true }, LightspeedLabelDistant = { fg = c.cyan, bold = true, underline = true }, - LightspeedLabelDistantOverlapped = { fg = c.cyan300, underline = true }, - LightspeedLabelOverlapped = { fg = c.magenta300, underline = true }, + LightspeedLabelDistantOverlapped = { fg = c.cyan500, underline = true }, + LightspeedLabelOverlapped = { fg = c.magenta500, underline = true }, LightspeedMaskedChar = { fg = c.orange }, - LightspeedOneCharMatch = { bg = c.magenta300, fg = c.fg, bold = true }, - LightspeedPendingOpArea = { bg = c.magenta300, fg = c.fg }, - LightspeedShortcut = { bg = c.magenta300, fg = c.fg, bold = true, underline = true }, + LightspeedOneCharMatch = { bg = c.magenta500, fg = c.fg, bold = true }, + LightspeedPendingOpArea = { bg = c.magenta500, fg = c.fg }, + LightspeedShortcut = { bg = c.magenta500, fg = c.fg, bold = true, underline = true }, -- LightspeedShortcutOverlapped = { link = "LightspeedShortcut" }, -- LightspeedUniqueChar = { link = "LightspeedUnlabeledMatch" }, - LightspeedUnlabeledMatch = { fg = c.violet300, bold = true }, + LightspeedUnlabeledMatch = { fg = c.violet500, bold = true }, -- Cmp CmpDocumentation = { fg = c.fg, bg = c.bg_float }, @@ -561,20 +632,22 @@ function M.setup() CmpItemAbbr = { fg = c.fg, bg = c.none }, CmpItemAbbrDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, - CmpItemAbbrMatch = { fg = c.violet300, bg = c.none }, - CmpItemAbbrMatchFuzzy = { fg = c.violet300, bg = c.none }, + CmpItemAbbrMatch = { fg = c.violet500, bg = c.none }, + CmpItemAbbrMatchFuzzy = { fg = c.violet500, bg = c.none }, CmpItemMenu = { fg = c.base01, bg = c.none }, CmpItemKindDefault = { fg = c.base01, bg = c.none }, - CmpItemKindKeyword = { fg = c.cyan, bg = c.none }, + CmpItemKindCodeium = { fg = c.cyan500, bg = c.none }, + CmpItemKindCopilot = { fg = c.cyan500, bg = c.none }, + CmpItemKindTabNine = { fg = c.cyan500, bg = c.none }, + CmpItemKindKeyword = { fg = c.cyan, bg = c.none }, CmpItemKindVariable = { fg = c.magenta, bg = c.none }, CmpItemKindConstant = { fg = c.magenta, bg = c.none }, CmpItemKindReference = { fg = c.magenta, bg = c.none }, CmpItemKindValue = { fg = c.magenta, bg = c.none }, - CmpItemKindCopilot = { fg = c.cyan300, bg = c.none }, CmpItemKindFunction = { fg = c.blue, bg = c.none }, CmpItemKindMethod = { fg = c.blue, bg = c.none }, @@ -594,7 +667,7 @@ function M.setup() CmpItemKindTypeParameter = { fg = c.cyan, bg = c.none }, CmpItemKindEnumMember = { fg = c.cyan, bg = c.none }, CmpItemKindOperator = { fg = c.cyan, bg = c.none }, - CmpItemKindSnippet = { fg = c.violet300, bg = c.none }, + CmpItemKindSnippet = { fg = c.violet500, bg = c.none }, -- navic NavicIconsFile = { fg = c.fg, bg = c.bg_statusline }, @@ -616,8 +689,8 @@ function M.setup() NavicIconsBoolean = { fg = c.orange, bg = c.bg_statusline }, NavicIconsArray = { fg = c.orange, bg = c.bg_statusline }, NavicIconsObject = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsKey = { fg = c.violet300, bg = c.bg_statusline }, - NavicIconsKeyword = { fg = c.violet300, bg = c.bg_statusline }, + NavicIconsKey = { fg = c.violet500, bg = c.bg_statusline }, + NavicIconsKeyword = { fg = c.violet500, bg = c.bg_statusline }, NavicIconsNull = { fg = c.orange, bg = c.bg_statusline }, NavicIconsEnumMember = { fg = c.cyan, bg = c.bg_statusline }, NavicIconsStruct = { fg = c.orange, bg = c.bg_statusline }, @@ -627,9 +700,9 @@ function M.setup() NavicText = { fg = c.fg, bg = c.bg_statusline }, NavicSeparator = { fg = c.fg, bg = c.bg_statusline }, - IblIndent = { fg = c.base2, style = options.styles.comments, nocombine = true }, + IblIndent = { fg = c.base03, nocombine = true }, IndentBlanklineChar = { fg = c.base03, nocombine = true }, - IndentBlanklineContextChar = { fg = c.orange300, nocombine = true }, + IndentBlanklineContextChar = { fg = c.orange500, nocombine = true }, -- Scrollbar ScrollbarHandle = { fg = c.none, bg = c.bg_highlight }, @@ -649,15 +722,15 @@ function M.setup() ScrollbarHintHandle = { fg = c.hint, bg = c.bg_highlight }, ScrollbarHint = { fg = c.hint, bg = c.none }, - ScrollbarMiscHandle = { fg = c.violet300, bg = c.bg_highlight }, - ScrollbarMisc = { fg = c.violet300, bg = c.none }, + ScrollbarMiscHandle = { fg = c.violet500, bg = c.bg_highlight }, + ScrollbarMisc = { fg = c.violet500, bg = c.none }, -- Yanky YankyPut = { link = "IncSearch" }, YankyYanked = { link = "IncSearch" }, -- Lazy - LazyProgressDone = { bold = true, fg = c.magenta300 }, + LazyProgressDone = { bold = true, fg = c.magenta500 }, LazyProgressTodo = { bold = true, fg = c.base01 }, -- Notify @@ -667,19 +740,19 @@ function M.setup() NotifyWARNBorder = { fg = util.darken(c.warning, 0.3), bg = options.transparent and c.none or c.bg }, NotifyINFOBorder = { fg = util.darken(c.info, 0.3), bg = options.transparent and c.none or c.bg }, NotifyDEBUGBorder = { fg = util.darken(c.base01, 0.3), bg = options.transparent and c.none or c.bg }, - NotifyTRACEBorder = { fg = util.darken(c.violet300, 0.3), bg = options.transparent and c.none or c.bg }, + NotifyTRACEBorder = { fg = util.darken(c.violet500, 0.3), bg = options.transparent and c.none or c.bg }, --- Icons NotifyERRORIcon = { fg = c.error }, NotifyWARNIcon = { fg = c.warning }, NotifyINFOIcon = { fg = c.info }, NotifyDEBUGIcon = { fg = c.base01 }, - NotifyTRACEIcon = { fg = c.violet300 }, + NotifyTRACEIcon = { fg = c.violet500 }, --- Title NotifyERRORTitle = { fg = c.error }, NotifyWARNTitle = { fg = c.warning }, NotifyINFOTitle = { fg = c.info }, NotifyDEBUGTitle = { fg = c.base01 }, - NotifyTRACETitle = { fg = c.violet300 }, + NotifyTRACETitle = { fg = c.violet500 }, --- Body NotifyERRORBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, NotifyWARNBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, @@ -693,31 +766,31 @@ function M.setup() MiniCursorword = { bg = c.base01 }, MiniCursorwordCurrent = { bg = c.base01 }, - MiniIndentscopeSymbol = { fg = c.violet500, nocombine = true }, + MiniIndentscopeSymbol = { fg = c.violet700, nocombine = true }, MiniIndentscopePrefix = { nocombine = true }, -- Make it invisible - MiniJump = { bg = c.magenta300, fg = c.base4 }, + MiniJump = { bg = c.magenta500, fg = c.base4 }, - MiniJump2dSpot = { fg = c.magenta300, bold = true, nocombine = true }, + MiniJump2dSpot = { fg = c.magenta500, bold = true, nocombine = true }, MiniStarterCurrent = { nocombine = true }, MiniStarterFooter = { fg = c.yellow, italic = true }, MiniStarterHeader = { fg = c.blue }, MiniStarterInactive = { fg = c.base01, style = options.styles.comments }, MiniStarterItem = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - MiniStarterItemBullet = { fg = c.base02 }, + MiniStarterItemBullet = { fg = c.base01 }, MiniStarterItemPrefix = { fg = c.warning }, - MiniStarterSection = { fg = c.violet300 }, + MiniStarterSection = { fg = c.violet500 }, MiniStarterQuery = { fg = c.info }, MiniStatuslineDevinfo = { fg = c.base01, bg = c.bg_highlight }, MiniStatuslineFileinfo = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineFilename = { fg = c.base01, bg = c.base01 }, + MiniStatuslineFilename = { fg = c.base01, bg = c.bg_highlight }, MiniStatuslineInactive = { fg = c.blue, bg = c.bg_statusline }, MiniStatuslineModeCommand = { fg = c.black, bg = c.yellow, bold = true }, MiniStatuslineModeInsert = { fg = c.black, bg = c.green, bold = true }, MiniStatuslineModeNormal = { fg = c.black, bg = c.blue, bold = true }, - MiniStatuslineModeOther = { fg = c.black, bg = c.cyan300, bold = true }, + MiniStatuslineModeOther = { fg = c.black, bg = c.cyan500, bold = true }, MiniStatuslineModeReplace = { fg = c.black, bg = c.red, bold = true }, MiniStatuslineModeVisual = { fg = c.black, bg = c.magenta, bold = true }, @@ -725,7 +798,7 @@ function M.setup() MiniTablineCurrent = { fg = c.fg, bg = c.base01 }, MiniTablineFill = { bg = c.black }, - MiniTablineHidden = { fg = c.violet300, bg = c.bg_statusline }, + MiniTablineHidden = { fg = c.violet500, bg = c.bg_statusline }, MiniTablineModifiedCurrent = { fg = c.warning, bg = c.base01 }, MiniTablineModifiedHidden = { bg = c.bg_statusline, fg = util.darken(c.warning, 0.7) }, MiniTablineModifiedVisible = { fg = c.warning, bg = c.bg_statusline }, @@ -742,34 +815,7 @@ function M.setup() NoiceCompletionItemKindDefault = { fg = c.base01, bg = c.none }, - NoiceCompletionItemKindKeyword = { fg = c.cyan, bg = c.none }, - - NoiceCompletionItemKindVariable = { fg = c.magenta, bg = c.none }, - NoiceCompletionItemKindConstant = { fg = c.magenta, bg = c.none }, - NoiceCompletionItemKindReference = { fg = c.magenta, bg = c.none }, - NoiceCompletionItemKindValue = { fg = c.magenta, bg = c.none }, - - NoiceCompletionItemKindFunction = { fg = c.blue, bg = c.none }, - NoiceCompletionItemKindMethod = { fg = c.blue, bg = c.none }, - NoiceCompletionItemKindConstructor = { fg = c.blue, bg = c.none }, - - NoiceCompletionItemKindClass = { fg = c.orange, bg = c.none }, - NoiceCompletionItemKindInterface = { fg = c.orange, bg = c.none }, - NoiceCompletionItemKindStruct = { fg = c.orange, bg = c.none }, - NoiceCompletionItemKindEvent = { fg = c.orange, bg = c.none }, - NoiceCompletionItemKindEnum = { fg = c.orange, bg = c.none }, - NoiceCompletionItemKindUnit = { fg = c.orange, bg = c.none }, - - NoiceCompletionItemKindModule = { fg = c.yellow, bg = c.none }, - - NoiceCompletionItemKindProperty = { fg = c.cyan, bg = c.none }, - NoiceCompletionItemKindField = { fg = c.cyan, bg = c.none }, - NoiceCompletionItemKindTypeParameter = { fg = c.cyan, bg = c.none }, - NoiceCompletionItemKindEnumMember = { fg = c.cyan, bg = c.none }, - NoiceCompletionItemKindOperator = { fg = c.cyan, bg = c.none }, - NoiceCompletionItemKindSnippet = { fg = c.violet300, bg = c.none }, - - TreesitterContext = { bg = c.base2, style = options.styles.comments }, + TreesitterContext = { bg = c.violet900 }, Hlargs = { fg = c.yellow }, }