From 59c900a2b03b9288cf9d636621048443dcc9409c Mon Sep 17 00:00:00 2001 From: bini-x Date: Thu, 26 Sep 2024 15:06:28 +0200 Subject: [PATCH 01/15] changed some colors for neotree --- lua/nordic/groups/integrations.lua | 1003 ++++++++++++++-------------- 1 file changed, 502 insertions(+), 501 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index b6c9c26..f07ba12 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -1,535 +1,536 @@ local M = {} function M.get_groups() - local C = require('nordic.colors') - local O = require('nordic.config').options + local C = require('nordic.colors') + local O = require('nordic.config').options - local G = {} + local G = {} - -- Dashboard.lua - G.DashboardHeader = { fg = C.yellow.base, bold = true } - G.DashboardFooter = { fg = C.cyan.base } - G.DashboardCenter = { fg = C.green.base } - G.DashboardShortCut = { fg = C.gray4, bold = true } - G.DashboardProjectTitle = { fg = C.orange.base, bold = true } - G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } - G.DashboardProjectIcon = { fg = C.magenta.bright } - G.DashboardMruTitle = { link = 'DashboardProjectTitle' } - G.DashboardMruIcon = {} - G.DashboardFiles = { fg = C.fg } - G.DashboardDesc = { fg = C.green.base } - G.DashboardKey = { fg = C.red.base, bold = true } - G.DashboardIcon = { fg = C.green.base } + -- Dashboard.lua + G.DashboardHeader = { fg = C.yellow.base, bold = true } + G.DashboardFooter = { fg = C.cyan.base } + G.DashboardCenter = { fg = C.green.base } + G.DashboardShortCut = { fg = C.gray4, bold = true } + G.DashboardProjectTitle = { fg = C.orange.base, bold = true } + G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } + G.DashboardProjectIcon = { fg = C.magenta.bright } + G.DashboardMruTitle = { link = 'DashboardProjectTitle' } + G.DashboardMruIcon = {} + G.DashboardFiles = { fg = C.fg } + G.DashboardDesc = { fg = C.green.base } + G.DashboardKey = { fg = C.red.base, bold = true } + G.DashboardIcon = { fg = C.green.base } - -- Diffview. - G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } - G.DiffviewStatusLine = { bg = C.black0 } - G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } - G.DiffviewFolderSign = { fg = C.yellow.dim } - G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } + -- Diffview. + G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } + G.DiffviewStatusLine = { bg = C.black0 } + G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } + G.DiffviewFolderSign = { fg = C.yellow.dim } + G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } - -- Gitsigns. - G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } - G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } - G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } - G.GitSignsAddPreview = { link = 'GitSignsAdd' } - G.GitSignsDeletePreview = { link = 'GitSignsDelete' } + -- Gitsigns. + G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } + G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } + G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } + G.GitSignsAddPreview = { link = 'GitSignsAdd' } + G.GitSignsDeletePreview = { link = 'GitSignsDelete' } - -- Indent blankline. - G.IndentBlanklineChar = { fg = C.gray1 } - G.IndentBlanklineContextChar = { fg = C.gray2 } - G.IndentBlanklineContextStart = { sp = C.white0, underline = true } + -- Indent blankline. + G.IndentBlanklineChar = { fg = C.gray1 } + G.IndentBlanklineContextChar = { fg = C.gray2 } + G.IndentBlanklineContextStart = { sp = C.white0, underline = true } - -- Lazy. - G.LazyH1 = { fg = C.yellow.base, bold = true } - G.LazyButtonActive = { link = 'LazyH1' } - G.LazyButton = { fg = C.white0 } - G.LazySpecial = { fg = C.yellow.base } - G.LazyProgressDone = { fg = C.green.bright } - G.LazyProgressTodo = { fg = C.gray4 } - G.LazyCommitType = { fg = C.yellow.base } + -- Lazy. + G.LazyH1 = { fg = C.yellow.base, bold = true } + G.LazyButtonActive = { link = 'LazyH1' } + G.LazyButton = { fg = C.white0 } + G.LazySpecial = { fg = C.yellow.base } + G.LazyProgressDone = { fg = C.green.bright } + G.LazyProgressTodo = { fg = C.gray4 } + G.LazyCommitType = { fg = C.yellow.base } - -- Leap. - G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } - if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end + -- Leap. + G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } + if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end - -- LSP Signature. - G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } + -- LSP Signature. + G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } - -- LSP Saga. - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } + -- LSP Saga. + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } - -- Mini Statusline. - local LC = require('lualine.themes.nordic') - G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } - G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } - G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } - G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } - G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } - G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } - G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } - G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } + -- Mini Statusline. + local LC = require('lualine.themes.nordic') + G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } + G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } + G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } + G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } + G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } + G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } + G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } + G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } - -- Nvim tree. - G.NvimTreeNormal = { fg = C.fg, bg = C.bg } - G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg } - G.NvimTreeFolderName = { fg = C.blue1 } - G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' } - G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' } - G.NvimTreeFolderIcon = { fg = C.yellow.dim } - G.NvimTreeSpecialFile = { fg = C.magenta.bright } - G.NvimTreeRootFolder = { fg = C.gray4 } - G.NvimTreeGitDirty = { fg = C.gray4 } - G.NvimTreeGitNew = { fg = C.gray4 } - G.NvimTreeGitDeleted = { fg = C.gray4 } - G.NvimTreeGitStaged = { fg = C.gray4 } - G.NvimTreeIndentMarker = { fg = C.gray4 } - G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg } - G.NvimTreeCursorLine = { bg = C.gray1 } - G.NvimTreeCursor = { bg = C.none, fg = C.none } - G.NvimTreeSymlink = { fg = C.blue2 } + -- Nvim tree. + G.NvimTreeNormal = { fg = C.fg, bg = C.bg } + G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg } + G.NvimTreeFolderName = { fg = C.blue1 } + G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' } + G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' } + G.NvimTreeFolderIcon = { fg = C.yellow.dim } + G.NvimTreeSpecialFile = { fg = C.magenta.bright } + G.NvimTreeRootFolder = { fg = C.gray4 } + G.NvimTreeGitDirty = { fg = C.gray4 } + G.NvimTreeGitNew = { fg = C.gray4 } + G.NvimTreeGitDeleted = { fg = C.gray4 } + G.NvimTreeGitStaged = { fg = C.gray4 } + G.NvimTreeIndentMarker = { fg = C.gray4 } + G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg } + G.NvimTreeCursorLine = { bg = C.gray1 } + G.NvimTreeCursor = { bg = C.none, fg = C.none } + G.NvimTreeSymlink = { fg = C.blue2 } - -- Neo tree. - G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } - G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } - G.NeoTreeRootName = { link = 'NvimTreeRootFolder' } - G.NeoTreeFileIcon = { fg = C.blue2 } - G.NeoTreeFileNameOpened = { fg = C.fg } - G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' } - G.NeoTreeGitAdded = { fg = C.git.add } - G.NeoTreeGitConflict = { fg = C.magenta.bright } - G.NeoTreeGitModified = { fg = C.git.change } - G.NeoTreeGitUntracked = { fg = C.fg_sidebar } - G.NeoTreeNormal = { link = 'NvimTreeNormal' } - G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } - G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } + -- Neo tree. + G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } + G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } + G.NeoTreeRootName = { fg = C.blue0 } + G.NeoTreeFileIcon = { fg = C.blue2 } + G.NeoTreeFileNameOpened = { fg = C.fg } + G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' } + G.NeoTreeGitAdded = { fg = C.git.add } + G.NeoTreeGitConflict = { fg = C.magenta.bright } + G.NeoTreeGitModified = { fg = C.git.change } + G.NeoTreeGitUntracked = { fg = C.red_b } + G.NeoTreeNormal = { link = 'NvimTreeNormal' } + G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } + G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } + G.NeoTreeTitleBar = { fg = C.orange_b } - -- Noice Flat. - G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } - G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } - G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } - G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } - G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } - G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } - G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } - G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } - G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } - G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopup = { bg = C.bg_float } + -- Noice Flat. + G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } + G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } + G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } + G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } + G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } + G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } + G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } + G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } + G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } + G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopup = { bg = C.bg_float } - -- Noice Classic. - if O.noice.style == 'classic' then - G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlinePopup = { bg = C.bg } - G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } - end + -- Noice Classic. + if O.noice.style == 'classic' then + G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlinePopup = { bg = C.bg } + G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } + end - -- Nvim cmp. - G.CmpItemAbbrDeprecated = { fg = C.grey4 } - G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } - G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } - G.CmpItemKindField = { link = '@field' } - G.CmpItemKindProperty = { link = '@property' } - G.CmpItemKindEvent = { link = 'Type' } - G.CmpItemKindText = { fg = C.grey4 } - G.CmpItemKindEnum = { link = 'Type' } - G.CmpItemKindKeyword = { link = 'Keyword' } - G.CmpItemKindConstant = { link = 'Constant' } - G.CmpItemKindConstructor = { link = 'Function' } - G.CmpItemKindReference = { fg = C.cyan.base } - G.CmpItemKindFunction = { link = 'Function' } - G.CmpItemKindStruct = { link = 'Type' } - G.CmpItemKindClass = { link = 'Type' } - G.CmpItemKindModule = { fg = C.yellow.dim } - G.CmpItemKindOperator = { link = 'Operator' } - G.CmpItemKindVariable = { fg = C.cyan.base } - G.CmpItemKindFile = { fg = C.blue1 } - G.CmpItemKindUnit = { link = 'Constant' } - G.CmpItemKindSnippet = { fg = C.blue1 } - G.CmpItemKindFolder = { fg = C.yellow.dark } - G.CmpItemKindMethod = { link = 'Function' } - G.CmpItemKindValue = { link = 'Constant' } - G.CmpItemKindEnumMember = { link = 'Type' } - G.CmpItemKindInterface = { link = 'Type' } - G.CmpItemKindColor = { link = 'Constant' } - G.CmpItemKindTypeParameter = { link = 'Type' } - G.CmpItemKindTabNine = { fg = C.red.base } - G.CmpItemKindCopilot = { fg = C.red.base } + -- Nvim cmp. + G.CmpItemAbbrDeprecated = { fg = C.grey4 } + G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } + G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } + G.CmpItemKindField = { link = '@field' } + G.CmpItemKindProperty = { link = '@property' } + G.CmpItemKindEvent = { link = 'Type' } + G.CmpItemKindText = { fg = C.grey4 } + G.CmpItemKindEnum = { link = 'Type' } + G.CmpItemKindKeyword = { link = 'Keyword' } + G.CmpItemKindConstant = { link = 'Constant' } + G.CmpItemKindConstructor = { link = 'Function' } + G.CmpItemKindReference = { fg = C.cyan.base } + G.CmpItemKindFunction = { link = 'Function' } + G.CmpItemKindStruct = { link = 'Type' } + G.CmpItemKindClass = { link = 'Type' } + G.CmpItemKindModule = { fg = C.yellow.dim } + G.CmpItemKindOperator = { link = 'Operator' } + G.CmpItemKindVariable = { fg = C.cyan.base } + G.CmpItemKindFile = { fg = C.blue1 } + G.CmpItemKindUnit = { link = 'Constant' } + G.CmpItemKindSnippet = { fg = C.blue1 } + G.CmpItemKindFolder = { fg = C.yellow.dark } + G.CmpItemKindMethod = { link = 'Function' } + G.CmpItemKindValue = { link = 'Constant' } + G.CmpItemKindEnumMember = { link = 'Type' } + G.CmpItemKindInterface = { link = 'Type' } + G.CmpItemKindColor = { link = 'Constant' } + G.CmpItemKindTypeParameter = { link = 'Type' } + G.CmpItemKindTabNine = { fg = C.red.base } + G.CmpItemKindCopilot = { fg = C.red.base } - -- Nvim DAP. - G.DapBreakPoint = { fg = C.red.bright } + -- Nvim DAP. + G.DapBreakPoint = { fg = C.red.bright } - -- Nvim DAP UI. - G.DapUINormal = { bg = C.bg_float } - G.DapUIStop = { fg = C.red.bright, bold = true } - G.DapUIRestart = { fg = C.green.bright, bold = true } - G.DapUIPlayPause = { fg = C.green.bright, bold = true } - G.DapUIStepInto = { fg = C.blue2, bold = true } - G.DapUIStepOver = { fg = C.blue2, bold = true } - G.DapUIStepOut = { fg = C.blue2, bold = true } - G.DapUIStepBack = { fg = C.blue3, bold = true } - G.DapUIValue = { fg = C.magenta.bright } - G.DapUIWatchesValue = { fg = C.green.bright } - G.DapUIType = { fg = C.yellow.base } - G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } - G.DapUIFloatNormal = { bg = C.bg } - G.DapUILineNumber = { fg = C.green.bright } + -- Nvim DAP UI. + G.DapUINormal = { bg = C.bg_float } + G.DapUIStop = { fg = C.red.bright, bold = true } + G.DapUIRestart = { fg = C.green.bright, bold = true } + G.DapUIPlayPause = { fg = C.green.bright, bold = true } + G.DapUIStepInto = { fg = C.blue2, bold = true } + G.DapUIStepOver = { fg = C.blue2, bold = true } + G.DapUIStepOut = { fg = C.blue2, bold = true } + G.DapUIStepBack = { fg = C.blue3, bold = true } + G.DapUIValue = { fg = C.magenta.bright } + G.DapUIWatchesValue = { fg = C.green.bright } + G.DapUIType = { fg = C.yellow.base } + G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } + G.DapUIFloatNormal = { bg = C.bg } + G.DapUILineNumber = { fg = C.green.bright } - -- Notify. - G.NotifyBackground = { bg = C.bg_float } - G.NotifyERRORBorder = { fg = C.error } - G.NotifyERRORIcon = { fg = C.error } - G.NotifyERRORTitle = { fg = C.error, bold = true } - G.NotifyERRORBody = { fg = C.fg } - G.NotifyWARNBorder = { fg = C.warn } - G.NotifyWARNIcon = { fg = C.warn } - G.NotifyWARNTitle = { fg = C.warn, bold = true } - G.NotifyWARNBody = { fg = C.fg } - G.NotifyINFOBorder = { fg = C.info } - G.NotifyINFOIcon = { fg = C.info } - G.NotifyINFOTitle = { fg = C.info, bold = true } - G.NotifyINFOBody = { fg = C.fg } - G.NotifyDEBUGBorder = { fg = C.orange.bright } - G.NotifyDEBUGIcon = { fg = C.orange.bright } - G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } - G.NotifyDEBUGBody = { fg = C.fg } - G.NotifyTRACEBorder = { fg = C.gray5 } - G.NotifyTRACEIcon = { fg = C.gray5 } - G.NotifyTRACETitle = { fg = C.gray5, bold = true } - G.NotifyTRACEBody = { fg = C.fg } + -- Notify. + G.NotifyBackground = { bg = C.bg_float } + G.NotifyERRORBorder = { fg = C.error } + G.NotifyERRORIcon = { fg = C.error } + G.NotifyERRORTitle = { fg = C.error, bold = true } + G.NotifyERRORBody = { fg = C.fg } + G.NotifyWARNBorder = { fg = C.warn } + G.NotifyWARNIcon = { fg = C.warn } + G.NotifyWARNTitle = { fg = C.warn, bold = true } + G.NotifyWARNBody = { fg = C.fg } + G.NotifyINFOBorder = { fg = C.info } + G.NotifyINFOIcon = { fg = C.info } + G.NotifyINFOTitle = { fg = C.info, bold = true } + G.NotifyINFOBody = { fg = C.fg } + G.NotifyDEBUGBorder = { fg = C.orange.bright } + G.NotifyDEBUGIcon = { fg = C.orange.bright } + G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } + G.NotifyDEBUGBody = { fg = C.fg } + G.NotifyTRACEBorder = { fg = C.gray5 } + G.NotifyTRACEIcon = { fg = C.gray5 } + G.NotifyTRACETitle = { fg = C.gray5, bold = true } + G.NotifyTRACEBody = { fg = C.fg } - -- Telescope Classic. - G.TelescopeNormal = { bg = C.bg } - G.TelescopePromptNormal = { bg = C.bg } - G.TelescopeResultsNormal = { bg = C.bg } - G.TelescopePreviewNormal = { bg = C.bg } - G.TelescopePreviewLine = { bg = C.gray2 } - G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeBorder = { fg = C.white0, bg = C.bg } - G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } - G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } - G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } - G.TelescopeMatching = { bold = true } - G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopeMultiSelection = { bg = C.bg } + -- Telescope Classic. + G.TelescopeNormal = { bg = C.bg } + G.TelescopePromptNormal = { bg = C.bg } + G.TelescopeResultsNormal = { bg = C.bg } + G.TelescopePreviewNormal = { bg = C.bg } + G.TelescopePreviewLine = { bg = C.gray2 } + G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeBorder = { fg = C.white0, bg = C.bg } + G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } + G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } + G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } + G.TelescopeMatching = { bold = true } + G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopeMultiSelection = { bg = C.bg } - -- Telescope Flat. - if O.telescope.style == 'flat' then - G.TelescopeNormal = { bg = C.bg_float } - G.TelescopePromptNormal = { bg = C.black2 } - G.TelescopeResultsNormal = { bg = C.bg_float } - G.TelescopePreviewNormal = { bg = C.bg_float } - G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } - G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeBorder = { fg = C.black0, bg = C.black0 } - G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } - G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopeMultiSelection = { bg = C.bg_float } - G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } - G.TelescopePreviewLine = { bg = C.gray1 } - end + -- Telescope Flat. + if O.telescope.style == 'flat' then + G.TelescopeNormal = { bg = C.bg_float } + G.TelescopePromptNormal = { bg = C.black2 } + G.TelescopeResultsNormal = { bg = C.bg_float } + G.TelescopePreviewNormal = { bg = C.bg_float } + G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } + G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeBorder = { fg = C.black0, bg = C.black0 } + G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } + G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopeMultiSelection = { bg = C.bg_float } + G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } + G.TelescopePreviewLine = { bg = C.gray1 } + end - -- Treesitter. - -- LSP Semantic Token Groups - -- Types follow the pattern @lsp.type.. - -- These groups are for the Neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - --- Misc - G['@comment'] = { link = 'Comment' } - --G['@comment.documentation'] = { link = 'Comment' } - G['@comment.documentation'] = { link = 'Comment' } - G['@comment.note'] = { fg = C.hint } - G['@comment.error'] = { fg = C.error } - G['@comment.hint'] = { fg = C.hint } - G['@comment.info'] = { fg = C.info } - G['@comment.warning'] = { fg = C.warning } - G['@comment.todo'] = { fg = C.todo } - G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. - --- Punctuation - G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` - G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. - G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. - G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } - --- Literals - G['@string'] = { link = 'String' } - G['@string.documentation'] = { link = 'String' } - G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. - G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. - --- Functions - G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. - G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] - --- Keywords - G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. - G['@keyword.conditional'] = { link = 'Conditional' } - G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. - G['@keyword.debug'] = { link = 'Debug' } - G['@keyword.directive'] = { link = 'PreProc' } - G['@keyword.directive.define'] = { link = 'Define' } - G['@keyword.exception'] = { link = 'Exception' } - G['@keyword.export'] = { link = 'Keyword' } - G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. - G['@keyword.import'] = { link = 'Include' } - G['@keyword.operator'] = { link = 'Keyword' } - G['@keyword.repeat'] = { link = 'Repeat' } - G['@keyword.return'] = { link = 'Keyword' } - G['@keyword.storage'] = { link = 'StorageClass' } - G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. - --- Types - G['@type.builtin'] = { link = 'Type' } - G['@field'] = { link = 'Field' } -- For fields. - G['@property'] = { link = 'Field' } - --- Identifiers - G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. - G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. - G['@variable.member'] = { link = 'Field' } - --- Text - -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text - -- G["@text.literal.markdown"] = { } - G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. - G['@text.strong'] = { bold = true } - G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. - G['@text.underline'] = { underline = true } -- For text to be represented with an underline. - G['@text.strike'] = { strikethrough = true } -- For strikethrough text. - G['@text.title'] = { link = 'Title' } -- Text that is part of a title. - G['@text.uri'] = { underline = true } -- Any URI like a link or email. - G['@text.literal'] = { link = 'String' } - G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@text.reference'] = { link = 'Link' } - G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. - G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. - G['@text.warning'] = { fg = C.warning } - G['@text.danger'] = { fg = C.error } - G['@text.diff.add'] = { link = 'DiffAdd' } - G['@text.diff.delete'] = { link = 'DiffDelete' } - G['@text.todo'] = { link = 'Todo' } - G['@text.note'] = { link = 'Note' } - --- Markup - G['@markup'] = { link = '@none' } - G['@markup.emphasis'] = { italic = true } - G['@markup.environment'] = { link = 'Macro' } - G['@markup.environment.name'] = { link = 'Type' } - G['@markup.heading'] = { link = 'Title' } - G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } - G['@markup.heading.2'] = { fg = C.orange.base, bold = true } - G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } - G['@markup.heading.4'] = { fg = C.green.base } - G['@markup.heading.5'] = { fg = C.blue2, italic = true } - G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } - G['@markup.italic'] = { italic = true } - G['@markup.list'] = { link = '@operator' } - G['@markup.list.checked'] = { link = 'Field' } - G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } - G['@markup.list.unchecked'] = { fg = C.fg } - G['@markup.link'] = { fg = C.cyan.base } - G['@markup.link.label'] = { link = 'SpecialChar' } - G['@markup.link.label.symbol'] = { link = 'Identifier' } - G['@markup.link.url'] = { link = 'Underlined' } - G['@markup.math'] = { link = 'Special' } - G['@markup.raw'] = { link = 'String' } - G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@markup.strong'] = { bold = true } - G['@markup.strikethrough'] = { strikethrough = true } - G['@markup.underline'] = { underline = true } - -- TSX - G['@tag.tsx'] = { fg = C.blue1 } - G['@constructor.tsx'] = { fg = C.blue1 } - G['@tag.delimiter.tsx'] = { fg = C.blue1 } - --LSP Semantic Token Groups - G['@lsp.type.boolean'] = { link = 'Boolean' } - G['@lsp.type.builtinType'] = { link = 'Type' } - G['@lsp.type.comment'] = { link = 'Comment' } - G['@lsp.type.enum'] = { link = 'Type' } - G['@lsp.type.enumMember'] = { link = 'Field' } - G['@lsp.type.escapeSequence'] = { link = '@string.escape' } - G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } - G['@lsp.type.interface'] = { link = 'Keyword' } - G['@lsp.type.keyword'] = { link = 'Keyword' } - G['@lsp.type.namespace'] = { link = 'Namespace' } - G['@lsp.type.number'] = { link = 'Number' } - G['@lsp.type.operator'] = { link = '@operator' } - G['@lsp.type.parameter'] = { link = '@parameter' } - G['@lsp.type.property'] = { link = '@property' } - G['@lsp.type.selfKeyword'] = { link = 'Builtin' } - G['@lsp.type.string.rust'] = { link = 'String' } - G['@lsp.type.typeAlias'] = { link = 'Type' } - G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } - G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables - G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } - G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.keyword.async'] = { link = 'Macro' } - G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } - G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.operator.injected'] = { link = 'Operator' } - G['@lsp.typemod.string.injected'] = { link = 'String' } - G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } - G['@lsp.typemod.variable.injected'] = { link = 'Variable' } - G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } - -- Things that seems to be missing? - G['@annotation'] = { link = 'PreProc' } - G['@diff.plus'] = { link = 'DiffAdd' } - G['@diff.minus'] = { link = 'DiffDelete' } - G['@diff.delta'] = { link = 'DiffChange' } - G['@character'] = { link = 'Character' } - G['@character.special'] = { link = 'SpecialChar' } - G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. - G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. - G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` - G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` - G['@constant'] = { link = 'Constant' } - G['@number'] = { link = 'Constant' } - G['@float'] = { link = 'Constant' } - G['@boolean'] = { link = 'Constant' } - G['@constant.macro'] = { link = 'Constant' } - G['@constant.builtin'] = { link = 'Constant' } - G['@repeat'] = { link = 'Keyword' } - G['@conditional'] = { link = 'Keyword' } - G['@class'] = { link = 'Keyword' } - G['@include'] = { link = 'Include' } - G['@macro'] = { link = 'Macro' } - G['@module'] = { fg = C.yellow.base } - G['@module.builtin'] = { link = 'Builtin' } - G['@preproc'] = { link = 'Macro' } - G['@attribute'] = { link = 'Macro' } - G['@function.macro'] = { link = 'Macro' } - G['@define'] = { link = 'Macro' } - G['@exception'] = { link = 'Macro' } - G['@function'] = { link = 'Function' } - G['@method'] = { link = 'Function' } - G['@method.call'] = { link = 'Function' } - G['@function.call'] = { link = 'Function' } - G['@function.builtin'] = { link = 'Function' } - G['@property.cpp'] = { fg = C.cyan.base } - G['@namespace'] = { fg = C.yellow.dim } - G['@type'] = { link = 'Type' } - G['@type.definition'] = { link = 'Type' } - G['@type.qualifier'] = { link = 'Keyword' } - G['@storageclass'] = { link = 'Keyword' } - G['@none'] = { link = 'None' } + -- Treesitter. + -- LSP Semantic Token Groups + -- Types follow the pattern @lsp.type.. + -- These groups are for the Neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + --- Misc + G['@comment'] = { link = 'Comment' } + --G['@comment.documentation'] = { link = 'Comment' } + G['@comment.documentation'] = { link = 'Comment' } + G['@comment.note'] = { fg = C.hint } + G['@comment.error'] = { fg = C.error } + G['@comment.hint'] = { fg = C.hint } + G['@comment.info'] = { fg = C.info } + G['@comment.warning'] = { fg = C.warning } + G['@comment.todo'] = { fg = C.todo } + G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. + --- Punctuation + G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` + G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. + G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. + G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } + --- Literals + G['@string'] = { link = 'String' } + G['@string.documentation'] = { link = 'String' } + G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. + G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. + --- Functions + G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. + G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] + --- Keywords + G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. + G['@keyword.conditional'] = { link = 'Conditional' } + G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. + G['@keyword.debug'] = { link = 'Debug' } + G['@keyword.directive'] = { link = 'PreProc' } + G['@keyword.directive.define'] = { link = 'Define' } + G['@keyword.exception'] = { link = 'Exception' } + G['@keyword.export'] = { link = 'Keyword' } + G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. + G['@keyword.import'] = { link = 'Include' } + G['@keyword.operator'] = { link = 'Keyword' } + G['@keyword.repeat'] = { link = 'Repeat' } + G['@keyword.return'] = { link = 'Keyword' } + G['@keyword.storage'] = { link = 'StorageClass' } + G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. + --- Types + G['@type.builtin'] = { link = 'Type' } + G['@field'] = { link = 'Field' } -- For fields. + G['@property'] = { link = 'Field' } + --- Identifiers + G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. + G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. + G['@variable.member'] = { link = 'Field' } + --- Text + -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text + -- G["@text.literal.markdown"] = { } + G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. + G['@text.strong'] = { bold = true } + G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. + G['@text.underline'] = { underline = true } -- For text to be represented with an underline. + G['@text.strike'] = { strikethrough = true } -- For strikethrough text. + G['@text.title'] = { link = 'Title' } -- Text that is part of a title. + G['@text.uri'] = { underline = true } -- Any URI like a link or email. + G['@text.literal'] = { link = 'String' } + G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@text.reference'] = { link = 'Link' } + G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. + G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. + G['@text.warning'] = { fg = C.warning } + G['@text.danger'] = { fg = C.error } + G['@text.diff.add'] = { link = 'DiffAdd' } + G['@text.diff.delete'] = { link = 'DiffDelete' } + G['@text.todo'] = { link = 'Todo' } + G['@text.note'] = { link = 'Note' } + --- Markup + G['@markup'] = { link = '@none' } + G['@markup.emphasis'] = { italic = true } + G['@markup.environment'] = { link = 'Macro' } + G['@markup.environment.name'] = { link = 'Type' } + G['@markup.heading'] = { link = 'Title' } + G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } + G['@markup.heading.2'] = { fg = C.orange.base, bold = true } + G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } + G['@markup.heading.4'] = { fg = C.green.base } + G['@markup.heading.5'] = { fg = C.blue2, italic = true } + G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } + G['@markup.italic'] = { italic = true } + G['@markup.list'] = { link = '@operator' } + G['@markup.list.checked'] = { link = 'Field' } + G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } + G['@markup.list.unchecked'] = { fg = C.fg } + G['@markup.link'] = { fg = C.cyan.base } + G['@markup.link.label'] = { link = 'SpecialChar' } + G['@markup.link.label.symbol'] = { link = 'Identifier' } + G['@markup.link.url'] = { link = 'Underlined' } + G['@markup.math'] = { link = 'Special' } + G['@markup.raw'] = { link = 'String' } + G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@markup.strong'] = { bold = true } + G['@markup.strikethrough'] = { strikethrough = true } + G['@markup.underline'] = { underline = true } + -- TSX + G['@tag.tsx'] = { fg = C.blue1 } + G['@constructor.tsx'] = { fg = C.blue1 } + G['@tag.delimiter.tsx'] = { fg = C.blue1 } + --LSP Semantic Token Groups + G['@lsp.type.boolean'] = { link = 'Boolean' } + G['@lsp.type.builtinType'] = { link = 'Type' } + G['@lsp.type.comment'] = { link = 'Comment' } + G['@lsp.type.enum'] = { link = 'Type' } + G['@lsp.type.enumMember'] = { link = 'Field' } + G['@lsp.type.escapeSequence'] = { link = '@string.escape' } + G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } + G['@lsp.type.interface'] = { link = 'Keyword' } + G['@lsp.type.keyword'] = { link = 'Keyword' } + G['@lsp.type.namespace'] = { link = 'Namespace' } + G['@lsp.type.number'] = { link = 'Number' } + G['@lsp.type.operator'] = { link = '@operator' } + G['@lsp.type.parameter'] = { link = '@parameter' } + G['@lsp.type.property'] = { link = '@property' } + G['@lsp.type.selfKeyword'] = { link = 'Builtin' } + G['@lsp.type.string.rust'] = { link = 'String' } + G['@lsp.type.typeAlias'] = { link = 'Type' } + G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } + G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables + G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } + G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.keyword.async'] = { link = 'Macro' } + G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } + G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.operator.injected'] = { link = 'Operator' } + G['@lsp.typemod.string.injected'] = { link = 'String' } + G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } + G['@lsp.typemod.variable.injected'] = { link = 'Variable' } + G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } + -- Things that seems to be missing? + G['@annotation'] = { link = 'PreProc' } + G['@diff.plus'] = { link = 'DiffAdd' } + G['@diff.minus'] = { link = 'DiffDelete' } + G['@diff.delta'] = { link = 'DiffChange' } + G['@character'] = { link = 'Character' } + G['@character.special'] = { link = 'SpecialChar' } + G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. + G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. + G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` + G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` + G['@constant'] = { link = 'Constant' } + G['@number'] = { link = 'Constant' } + G['@float'] = { link = 'Constant' } + G['@boolean'] = { link = 'Constant' } + G['@constant.macro'] = { link = 'Constant' } + G['@constant.builtin'] = { link = 'Constant' } + G['@repeat'] = { link = 'Keyword' } + G['@conditional'] = { link = 'Keyword' } + G['@class'] = { link = 'Keyword' } + G['@include'] = { link = 'Include' } + G['@macro'] = { link = 'Macro' } + G['@module'] = { fg = C.yellow.base } + G['@module.builtin'] = { link = 'Builtin' } + G['@preproc'] = { link = 'Macro' } + G['@attribute'] = { link = 'Macro' } + G['@function.macro'] = { link = 'Macro' } + G['@define'] = { link = 'Macro' } + G['@exception'] = { link = 'Macro' } + G['@function'] = { link = 'Function' } + G['@method'] = { link = 'Function' } + G['@method.call'] = { link = 'Function' } + G['@function.call'] = { link = 'Function' } + G['@function.builtin'] = { link = 'Function' } + G['@property.cpp'] = { fg = C.cyan.base } + G['@namespace'] = { fg = C.yellow.dim } + G['@type'] = { link = 'Type' } + G['@type.definition'] = { link = 'Type' } + G['@type.qualifier'] = { link = 'Keyword' } + G['@storageclass'] = { link = 'Keyword' } + G['@none'] = { link = 'None' } - -- Treesitter context. - local bg - local fg - if O.ts_context.dark_background then - bg = C.black1 - fg = C.gray1 - else - bg = C.gray1 - fg = C.gray4 - end - G.TreesitterContext = { bg = bg } - G.TreesitterContextLineNumber = { fg = fg, bg = bg } + -- Treesitter context. + local bg + local fg + if O.ts_context.dark_background then + bg = C.black1 + fg = C.gray1 + else + bg = C.gray1 + fg = C.gray4 + end + G.TreesitterContext = { bg = bg } + G.TreesitterContextLineNumber = { fg = fg, bg = bg } - -- Neorg - G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } - G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } - G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } - G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } - G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } - G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } - G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } - G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } - G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } - G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } - G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } - G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } + -- Neorg + G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } + G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } + G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } + G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } + G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } + G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } + G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } + G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } + G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } + G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } + G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } + G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } - -- Trouble. - G.TroubleNormal = { bg = C.bg_float } - G.TroubleText = { fg = C.fg } - G.TroubleCount = { fg = C.white1, bg = C.gray2 } - G.TroubleIndent = { fg = C.gray1 } - G.TroubleFile = { fg = C.cyan.bright } - G.TroubleFoldIcon = { fg = C.gray1 } + -- Trouble. + G.TroubleNormal = { bg = C.bg_float } + G.TroubleText = { fg = C.fg } + G.TroubleCount = { fg = C.white1, bg = C.gray2 } + G.TroubleIndent = { fg = C.gray1 } + G.TroubleFile = { fg = C.cyan.bright } + G.TroubleFoldIcon = { fg = C.gray1 } - -- Vimtex. - G.texGroup = { fg = C.fg } - G.texEnvArgName = { fg = C.cyan.base } - G.texMathEnvArgName = { link = 'texEnvArgName' } - G.texArg = { fg = C.cyan.base } - G.texStyleItal = { fg = C.fg, italic = true } - G.texPartArgTitle = { fg = C.cyan.base } - G.texDelim = { fg = C.fg } - G.texMathGroup = { fg = C.fg } - G.texMathArg = { fg = C.fg } - G.texMathZoneEnv = { fg = C.fg } - G.texMathZoneTI = { fg = C.fg } - G.texMathDelim = { fg = C.fg } - G.texMathDelimZoneTI = { fg = C.blue2 } - G.texMathSuper = { fg = C.fg } - G.texFileArg = { fg = C.green.base } - G.texRefArg = { fg = C.magenta.bright } - G.texGroupError = { link = 'DiagnosticError' } - G.texMathSub = { fg = C.fg } - G.texCmdEnv = { fg = C.blue2 } - G.texSpecialChar = { fg = C.orange.base } - G.texLigature = { fg = C.fg } - G.texFileOpt = { fg = C.fg } - G.texVerbZone = { link = 'String' } - G.texLstZone = { link = 'String' } + -- Vimtex. + G.texGroup = { fg = C.fg } + G.texEnvArgName = { fg = C.cyan.base } + G.texMathEnvArgName = { link = 'texEnvArgName' } + G.texArg = { fg = C.cyan.base } + G.texStyleItal = { fg = C.fg, italic = true } + G.texPartArgTitle = { fg = C.cyan.base } + G.texDelim = { fg = C.fg } + G.texMathGroup = { fg = C.fg } + G.texMathArg = { fg = C.fg } + G.texMathZoneEnv = { fg = C.fg } + G.texMathZoneTI = { fg = C.fg } + G.texMathDelim = { fg = C.fg } + G.texMathDelimZoneTI = { fg = C.blue2 } + G.texMathSuper = { fg = C.fg } + G.texFileArg = { fg = C.green.base } + G.texRefArg = { fg = C.magenta.bright } + G.texGroupError = { link = 'DiagnosticError' } + G.texMathSub = { fg = C.fg } + G.texCmdEnv = { fg = C.blue2 } + G.texSpecialChar = { fg = C.orange.base } + G.texLigature = { fg = C.fg } + G.texFileOpt = { fg = C.fg } + G.texVerbZone = { link = 'String' } + G.texLstZone = { link = 'String' } - -- Whichkey. - G.WhichKey = { fg = C.yellow.base } - G.WhichKeyFloat = { bg = C.bg_float } - G.WhichKeyDesc = { fg = C.white0 } - G.WhichKeyGroup = { fg = C.orange.bright, bold = true } - G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } - -- TODO: Unsure. - G.WhichKeySeperator = {} - G.WhichKeyValue = {} + -- Whichkey. + G.WhichKey = { fg = C.yellow.base } + G.WhichKeyFloat = { bg = C.bg_float } + G.WhichKeyDesc = { fg = C.white0 } + G.WhichKeyGroup = { fg = C.orange.bright, bold = true } + G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } + -- TODO: Unsure. + G.WhichKeySeperator = {} + G.WhichKeyValue = {} - -- Rainbow delimiters - G.RainbowDelimiterOrange = { fg = C.orange.base } - G.RainbowDelimiterYellow = { fg = C.yellow.bright } - G.RainbowDelimiterBlue = { fg = C.blue2 } - G.RainbowDelimiterRed = { fg = C.red.bright } - G.RainbowDelimiterGreen = { fg = C.green.bright } + -- Rainbow delimiters + G.RainbowDelimiterOrange = { fg = C.orange.base } + G.RainbowDelimiterYellow = { fg = C.yellow.bright } + G.RainbowDelimiterBlue = { fg = C.blue2 } + G.RainbowDelimiterRed = { fg = C.red.bright } + G.RainbowDelimiterGreen = { fg = C.green.bright } - return G + return G end return M From 2c1399d27cf31cc5e6a8665ea641b9e2f41afa5b Mon Sep 17 00:00:00 2001 From: bini-x Date: Thu, 26 Sep 2024 15:46:47 +0200 Subject: [PATCH 02/15] changed some neotree colors --- lua/nordic/groups/integrations.lua | 1060 ++++++++++++++-------------- 1 file changed, 530 insertions(+), 530 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index f07ba12..c32bfa4 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -1,536 +1,536 @@ local M = {} function M.get_groups() - local C = require('nordic.colors') - local O = require('nordic.config').options - - local G = {} - - -- Dashboard.lua - G.DashboardHeader = { fg = C.yellow.base, bold = true } - G.DashboardFooter = { fg = C.cyan.base } - G.DashboardCenter = { fg = C.green.base } - G.DashboardShortCut = { fg = C.gray4, bold = true } - G.DashboardProjectTitle = { fg = C.orange.base, bold = true } - G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } - G.DashboardProjectIcon = { fg = C.magenta.bright } - G.DashboardMruTitle = { link = 'DashboardProjectTitle' } - G.DashboardMruIcon = {} - G.DashboardFiles = { fg = C.fg } - G.DashboardDesc = { fg = C.green.base } - G.DashboardKey = { fg = C.red.base, bold = true } - G.DashboardIcon = { fg = C.green.base } - - -- Diffview. - G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } - G.DiffviewStatusLine = { bg = C.black0 } - G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } - G.DiffviewFolderSign = { fg = C.yellow.dim } - G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } - - -- Gitsigns. - G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } - G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } - G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } - G.GitSignsAddPreview = { link = 'GitSignsAdd' } - G.GitSignsDeletePreview = { link = 'GitSignsDelete' } - - -- Indent blankline. - G.IndentBlanklineChar = { fg = C.gray1 } - G.IndentBlanklineContextChar = { fg = C.gray2 } - G.IndentBlanklineContextStart = { sp = C.white0, underline = true } - - -- Lazy. - G.LazyH1 = { fg = C.yellow.base, bold = true } - G.LazyButtonActive = { link = 'LazyH1' } - G.LazyButton = { fg = C.white0 } - G.LazySpecial = { fg = C.yellow.base } - G.LazyProgressDone = { fg = C.green.bright } - G.LazyProgressTodo = { fg = C.gray4 } - G.LazyCommitType = { fg = C.yellow.base } - - -- Leap. - G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } - if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end - - -- LSP Signature. - G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } - - -- LSP Saga. - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } - - -- Mini Statusline. - local LC = require('lualine.themes.nordic') - G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } - G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } - G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } - G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } - G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } - G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } - G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } - G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } - - -- Nvim tree. - G.NvimTreeNormal = { fg = C.fg, bg = C.bg } - G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg } - G.NvimTreeFolderName = { fg = C.blue1 } - G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' } - G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' } - G.NvimTreeFolderIcon = { fg = C.yellow.dim } - G.NvimTreeSpecialFile = { fg = C.magenta.bright } - G.NvimTreeRootFolder = { fg = C.gray4 } - G.NvimTreeGitDirty = { fg = C.gray4 } - G.NvimTreeGitNew = { fg = C.gray4 } - G.NvimTreeGitDeleted = { fg = C.gray4 } - G.NvimTreeGitStaged = { fg = C.gray4 } - G.NvimTreeIndentMarker = { fg = C.gray4 } - G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg } - G.NvimTreeCursorLine = { bg = C.gray1 } - G.NvimTreeCursor = { bg = C.none, fg = C.none } - G.NvimTreeSymlink = { fg = C.blue2 } - - -- Neo tree. - G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } - G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } - G.NeoTreeRootName = { fg = C.blue0 } - G.NeoTreeFileIcon = { fg = C.blue2 } - G.NeoTreeFileNameOpened = { fg = C.fg } - G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' } - G.NeoTreeGitAdded = { fg = C.git.add } - G.NeoTreeGitConflict = { fg = C.magenta.bright } - G.NeoTreeGitModified = { fg = C.git.change } - G.NeoTreeGitUntracked = { fg = C.red_b } - G.NeoTreeNormal = { link = 'NvimTreeNormal' } - G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } - G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } - G.NeoTreeTitleBar = { fg = C.orange_b } - - -- Noice Flat. - G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } - G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } - G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } - G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } - G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } - G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } - G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } - G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } - G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } - G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopup = { bg = C.bg_float } - - -- Noice Classic. - if O.noice.style == 'classic' then - G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlinePopup = { bg = C.bg } - G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } - end - - -- Nvim cmp. - G.CmpItemAbbrDeprecated = { fg = C.grey4 } - G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } - G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } - G.CmpItemKindField = { link = '@field' } - G.CmpItemKindProperty = { link = '@property' } - G.CmpItemKindEvent = { link = 'Type' } - G.CmpItemKindText = { fg = C.grey4 } - G.CmpItemKindEnum = { link = 'Type' } - G.CmpItemKindKeyword = { link = 'Keyword' } - G.CmpItemKindConstant = { link = 'Constant' } - G.CmpItemKindConstructor = { link = 'Function' } - G.CmpItemKindReference = { fg = C.cyan.base } - G.CmpItemKindFunction = { link = 'Function' } - G.CmpItemKindStruct = { link = 'Type' } - G.CmpItemKindClass = { link = 'Type' } - G.CmpItemKindModule = { fg = C.yellow.dim } - G.CmpItemKindOperator = { link = 'Operator' } - G.CmpItemKindVariable = { fg = C.cyan.base } - G.CmpItemKindFile = { fg = C.blue1 } - G.CmpItemKindUnit = { link = 'Constant' } - G.CmpItemKindSnippet = { fg = C.blue1 } - G.CmpItemKindFolder = { fg = C.yellow.dark } - G.CmpItemKindMethod = { link = 'Function' } - G.CmpItemKindValue = { link = 'Constant' } - G.CmpItemKindEnumMember = { link = 'Type' } - G.CmpItemKindInterface = { link = 'Type' } - G.CmpItemKindColor = { link = 'Constant' } - G.CmpItemKindTypeParameter = { link = 'Type' } - G.CmpItemKindTabNine = { fg = C.red.base } - G.CmpItemKindCopilot = { fg = C.red.base } - - -- Nvim DAP. - G.DapBreakPoint = { fg = C.red.bright } - - -- Nvim DAP UI. - G.DapUINormal = { bg = C.bg_float } - G.DapUIStop = { fg = C.red.bright, bold = true } - G.DapUIRestart = { fg = C.green.bright, bold = true } - G.DapUIPlayPause = { fg = C.green.bright, bold = true } - G.DapUIStepInto = { fg = C.blue2, bold = true } - G.DapUIStepOver = { fg = C.blue2, bold = true } - G.DapUIStepOut = { fg = C.blue2, bold = true } - G.DapUIStepBack = { fg = C.blue3, bold = true } - G.DapUIValue = { fg = C.magenta.bright } - G.DapUIWatchesValue = { fg = C.green.bright } - G.DapUIType = { fg = C.yellow.base } - G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } - G.DapUIFloatNormal = { bg = C.bg } - G.DapUILineNumber = { fg = C.green.bright } - - -- Notify. - G.NotifyBackground = { bg = C.bg_float } - G.NotifyERRORBorder = { fg = C.error } - G.NotifyERRORIcon = { fg = C.error } - G.NotifyERRORTitle = { fg = C.error, bold = true } - G.NotifyERRORBody = { fg = C.fg } - G.NotifyWARNBorder = { fg = C.warn } - G.NotifyWARNIcon = { fg = C.warn } - G.NotifyWARNTitle = { fg = C.warn, bold = true } - G.NotifyWARNBody = { fg = C.fg } - G.NotifyINFOBorder = { fg = C.info } - G.NotifyINFOIcon = { fg = C.info } - G.NotifyINFOTitle = { fg = C.info, bold = true } - G.NotifyINFOBody = { fg = C.fg } - G.NotifyDEBUGBorder = { fg = C.orange.bright } - G.NotifyDEBUGIcon = { fg = C.orange.bright } - G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } - G.NotifyDEBUGBody = { fg = C.fg } - G.NotifyTRACEBorder = { fg = C.gray5 } - G.NotifyTRACEIcon = { fg = C.gray5 } - G.NotifyTRACETitle = { fg = C.gray5, bold = true } - G.NotifyTRACEBody = { fg = C.fg } - - -- Telescope Classic. - G.TelescopeNormal = { bg = C.bg } - G.TelescopePromptNormal = { bg = C.bg } - G.TelescopeResultsNormal = { bg = C.bg } - G.TelescopePreviewNormal = { bg = C.bg } - G.TelescopePreviewLine = { bg = C.gray2 } - G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeBorder = { fg = C.white0, bg = C.bg } - G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } - G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } - G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } - G.TelescopeMatching = { bold = true } - G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopeMultiSelection = { bg = C.bg } - - -- Telescope Flat. - if O.telescope.style == 'flat' then - G.TelescopeNormal = { bg = C.bg_float } - G.TelescopePromptNormal = { bg = C.black2 } - G.TelescopeResultsNormal = { bg = C.bg_float } - G.TelescopePreviewNormal = { bg = C.bg_float } - G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } - G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeBorder = { fg = C.black0, bg = C.black0 } - G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } - G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopeMultiSelection = { bg = C.bg_float } - G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } - G.TelescopePreviewLine = { bg = C.gray1 } - end - - -- Treesitter. - -- LSP Semantic Token Groups - -- Types follow the pattern @lsp.type.. - -- These groups are for the Neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - --- Misc - G['@comment'] = { link = 'Comment' } - --G['@comment.documentation'] = { link = 'Comment' } - G['@comment.documentation'] = { link = 'Comment' } - G['@comment.note'] = { fg = C.hint } - G['@comment.error'] = { fg = C.error } - G['@comment.hint'] = { fg = C.hint } - G['@comment.info'] = { fg = C.info } - G['@comment.warning'] = { fg = C.warning } - G['@comment.todo'] = { fg = C.todo } - G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. - --- Punctuation - G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` - G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. - G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. - G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } - --- Literals - G['@string'] = { link = 'String' } - G['@string.documentation'] = { link = 'String' } - G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. - G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. - --- Functions - G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. - G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] - --- Keywords - G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. - G['@keyword.conditional'] = { link = 'Conditional' } - G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. - G['@keyword.debug'] = { link = 'Debug' } - G['@keyword.directive'] = { link = 'PreProc' } - G['@keyword.directive.define'] = { link = 'Define' } - G['@keyword.exception'] = { link = 'Exception' } - G['@keyword.export'] = { link = 'Keyword' } - G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. - G['@keyword.import'] = { link = 'Include' } - G['@keyword.operator'] = { link = 'Keyword' } - G['@keyword.repeat'] = { link = 'Repeat' } - G['@keyword.return'] = { link = 'Keyword' } - G['@keyword.storage'] = { link = 'StorageClass' } - G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. - --- Types - G['@type.builtin'] = { link = 'Type' } - G['@field'] = { link = 'Field' } -- For fields. - G['@property'] = { link = 'Field' } - --- Identifiers - G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. - G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. - G['@variable.member'] = { link = 'Field' } - --- Text - -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text - -- G["@text.literal.markdown"] = { } - G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. - G['@text.strong'] = { bold = true } - G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. - G['@text.underline'] = { underline = true } -- For text to be represented with an underline. - G['@text.strike'] = { strikethrough = true } -- For strikethrough text. - G['@text.title'] = { link = 'Title' } -- Text that is part of a title. - G['@text.uri'] = { underline = true } -- Any URI like a link or email. - G['@text.literal'] = { link = 'String' } - G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@text.reference'] = { link = 'Link' } - G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. - G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. - G['@text.warning'] = { fg = C.warning } - G['@text.danger'] = { fg = C.error } - G['@text.diff.add'] = { link = 'DiffAdd' } - G['@text.diff.delete'] = { link = 'DiffDelete' } - G['@text.todo'] = { link = 'Todo' } - G['@text.note'] = { link = 'Note' } - --- Markup - G['@markup'] = { link = '@none' } - G['@markup.emphasis'] = { italic = true } - G['@markup.environment'] = { link = 'Macro' } - G['@markup.environment.name'] = { link = 'Type' } - G['@markup.heading'] = { link = 'Title' } - G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } - G['@markup.heading.2'] = { fg = C.orange.base, bold = true } - G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } - G['@markup.heading.4'] = { fg = C.green.base } - G['@markup.heading.5'] = { fg = C.blue2, italic = true } - G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } - G['@markup.italic'] = { italic = true } - G['@markup.list'] = { link = '@operator' } - G['@markup.list.checked'] = { link = 'Field' } - G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } - G['@markup.list.unchecked'] = { fg = C.fg } - G['@markup.link'] = { fg = C.cyan.base } - G['@markup.link.label'] = { link = 'SpecialChar' } - G['@markup.link.label.symbol'] = { link = 'Identifier' } - G['@markup.link.url'] = { link = 'Underlined' } - G['@markup.math'] = { link = 'Special' } - G['@markup.raw'] = { link = 'String' } - G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@markup.strong'] = { bold = true } - G['@markup.strikethrough'] = { strikethrough = true } - G['@markup.underline'] = { underline = true } - -- TSX - G['@tag.tsx'] = { fg = C.blue1 } - G['@constructor.tsx'] = { fg = C.blue1 } - G['@tag.delimiter.tsx'] = { fg = C.blue1 } - --LSP Semantic Token Groups - G['@lsp.type.boolean'] = { link = 'Boolean' } - G['@lsp.type.builtinType'] = { link = 'Type' } - G['@lsp.type.comment'] = { link = 'Comment' } - G['@lsp.type.enum'] = { link = 'Type' } - G['@lsp.type.enumMember'] = { link = 'Field' } - G['@lsp.type.escapeSequence'] = { link = '@string.escape' } - G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } - G['@lsp.type.interface'] = { link = 'Keyword' } - G['@lsp.type.keyword'] = { link = 'Keyword' } - G['@lsp.type.namespace'] = { link = 'Namespace' } - G['@lsp.type.number'] = { link = 'Number' } - G['@lsp.type.operator'] = { link = '@operator' } - G['@lsp.type.parameter'] = { link = '@parameter' } - G['@lsp.type.property'] = { link = '@property' } - G['@lsp.type.selfKeyword'] = { link = 'Builtin' } - G['@lsp.type.string.rust'] = { link = 'String' } - G['@lsp.type.typeAlias'] = { link = 'Type' } - G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } - G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables - G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } - G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.keyword.async'] = { link = 'Macro' } - G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } - G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.operator.injected'] = { link = 'Operator' } - G['@lsp.typemod.string.injected'] = { link = 'String' } - G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } - G['@lsp.typemod.variable.injected'] = { link = 'Variable' } - G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } - -- Things that seems to be missing? - G['@annotation'] = { link = 'PreProc' } - G['@diff.plus'] = { link = 'DiffAdd' } - G['@diff.minus'] = { link = 'DiffDelete' } - G['@diff.delta'] = { link = 'DiffChange' } - G['@character'] = { link = 'Character' } - G['@character.special'] = { link = 'SpecialChar' } - G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. - G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. - G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` - G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` - G['@constant'] = { link = 'Constant' } - G['@number'] = { link = 'Constant' } - G['@float'] = { link = 'Constant' } - G['@boolean'] = { link = 'Constant' } - G['@constant.macro'] = { link = 'Constant' } - G['@constant.builtin'] = { link = 'Constant' } - G['@repeat'] = { link = 'Keyword' } - G['@conditional'] = { link = 'Keyword' } - G['@class'] = { link = 'Keyword' } - G['@include'] = { link = 'Include' } - G['@macro'] = { link = 'Macro' } - G['@module'] = { fg = C.yellow.base } - G['@module.builtin'] = { link = 'Builtin' } - G['@preproc'] = { link = 'Macro' } - G['@attribute'] = { link = 'Macro' } - G['@function.macro'] = { link = 'Macro' } - G['@define'] = { link = 'Macro' } - G['@exception'] = { link = 'Macro' } - G['@function'] = { link = 'Function' } - G['@method'] = { link = 'Function' } - G['@method.call'] = { link = 'Function' } - G['@function.call'] = { link = 'Function' } - G['@function.builtin'] = { link = 'Function' } - G['@property.cpp'] = { fg = C.cyan.base } - G['@namespace'] = { fg = C.yellow.dim } - G['@type'] = { link = 'Type' } - G['@type.definition'] = { link = 'Type' } - G['@type.qualifier'] = { link = 'Keyword' } - G['@storageclass'] = { link = 'Keyword' } - G['@none'] = { link = 'None' } - - -- Treesitter context. - local bg - local fg - if O.ts_context.dark_background then - bg = C.black1 - fg = C.gray1 - else - bg = C.gray1 - fg = C.gray4 - end - G.TreesitterContext = { bg = bg } - G.TreesitterContextLineNumber = { fg = fg, bg = bg } - - -- Neorg - G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } - G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } - G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } - G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } - G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } - G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } - G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } - G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } - G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } - G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } - G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } - G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } - - -- Trouble. - G.TroubleNormal = { bg = C.bg_float } - G.TroubleText = { fg = C.fg } - G.TroubleCount = { fg = C.white1, bg = C.gray2 } - G.TroubleIndent = { fg = C.gray1 } - G.TroubleFile = { fg = C.cyan.bright } - G.TroubleFoldIcon = { fg = C.gray1 } - - -- Vimtex. - G.texGroup = { fg = C.fg } - G.texEnvArgName = { fg = C.cyan.base } - G.texMathEnvArgName = { link = 'texEnvArgName' } - G.texArg = { fg = C.cyan.base } - G.texStyleItal = { fg = C.fg, italic = true } - G.texPartArgTitle = { fg = C.cyan.base } - G.texDelim = { fg = C.fg } - G.texMathGroup = { fg = C.fg } - G.texMathArg = { fg = C.fg } - G.texMathZoneEnv = { fg = C.fg } - G.texMathZoneTI = { fg = C.fg } - G.texMathDelim = { fg = C.fg } - G.texMathDelimZoneTI = { fg = C.blue2 } - G.texMathSuper = { fg = C.fg } - G.texFileArg = { fg = C.green.base } - G.texRefArg = { fg = C.magenta.bright } - G.texGroupError = { link = 'DiagnosticError' } - G.texMathSub = { fg = C.fg } - G.texCmdEnv = { fg = C.blue2 } - G.texSpecialChar = { fg = C.orange.base } - G.texLigature = { fg = C.fg } - G.texFileOpt = { fg = C.fg } - G.texVerbZone = { link = 'String' } - G.texLstZone = { link = 'String' } - - -- Whichkey. - G.WhichKey = { fg = C.yellow.base } - G.WhichKeyFloat = { bg = C.bg_float } - G.WhichKeyDesc = { fg = C.white0 } - G.WhichKeyGroup = { fg = C.orange.bright, bold = true } - G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } - -- TODO: Unsure. - G.WhichKeySeperator = {} - G.WhichKeyValue = {} - - -- Rainbow delimiters - G.RainbowDelimiterOrange = { fg = C.orange.base } - G.RainbowDelimiterYellow = { fg = C.yellow.bright } - G.RainbowDelimiterBlue = { fg = C.blue2 } - G.RainbowDelimiterRed = { fg = C.red.bright } - G.RainbowDelimiterGreen = { fg = C.green.bright } - - return G + local C = require('nordic.colors') + local O = require('nordic.config').options + + local G = {} + + -- Dashboard.lua + G.DashboardHeader = { fg = C.yellow.base, bold = true } + G.DashboardFooter = { fg = C.cyan.base } + G.DashboardCenter = { fg = C.green.base } + G.DashboardShortCut = { fg = C.gray4, bold = true } + G.DashboardProjectTitle = { fg = C.orange.base, bold = true } + G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } + G.DashboardProjectIcon = { fg = C.magenta.bright } + G.DashboardMruTitle = { link = 'DashboardProjectTitle' } + G.DashboardMruIcon = {} + G.DashboardFiles = { fg = C.fg } + G.DashboardDesc = { fg = C.green.base } + G.DashboardKey = { fg = C.red.base, bold = true } + G.DashboardIcon = { fg = C.green.base } + + -- Diffview. + G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } + G.DiffviewStatusLine = { bg = C.black0 } + G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } + G.DiffviewFolderSign = { fg = C.yellow.dim } + G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } + + -- Gitsigns. + G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } + G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } + G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } + G.GitSignsAddPreview = { link = 'GitSignsAdd' } + G.GitSignsDeletePreview = { link = 'GitSignsDelete' } + + -- Indent blankline. + G.IndentBlanklineChar = { fg = C.gray1 } + G.IndentBlanklineContextChar = { fg = C.gray2 } + G.IndentBlanklineContextStart = { sp = C.white0, underline = true } + + -- Lazy. + G.LazyH1 = { fg = C.yellow.base, bold = true } + G.LazyButtonActive = { link = 'LazyH1' } + G.LazyButton = { fg = C.white0 } + G.LazySpecial = { fg = C.yellow.base } + G.LazyProgressDone = { fg = C.green.bright } + G.LazyProgressTodo = { fg = C.gray4 } + G.LazyCommitType = { fg = C.yellow.base } + + -- Leap. + G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } + if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end + + -- LSP Signature. + G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } + + -- LSP Saga. + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } + + -- Mini Statusline. + local LC = require('lualine.themes.nordic') + G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } + G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } + G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } + G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } + G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } + G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } + G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } + G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } + + -- Nvim tree. + G.NvimTreeNormal = { fg = C.fg, bg = C.bg } + G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg } + G.NvimTreeFolderName = { fg = C.blue1 } + G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' } + G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' } + G.NvimTreeFolderIcon = { fg = C.yellow.dim } + G.NvimTreeSpecialFile = { fg = C.magenta.bright } + G.NvimTreeRootFolder = { fg = C.gray4 } + G.NvimTreeGitDirty = { fg = C.gray4 } + G.NvimTreeGitNew = { fg = C.gray4 } + G.NvimTreeGitDeleted = { fg = C.gray4 } + G.NvimTreeGitStaged = { fg = C.gray4 } + G.NvimTreeIndentMarker = { fg = C.gray4 } + G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg } + G.NvimTreeCursorLine = { bg = C.gray1 } + G.NvimTreeCursor = { bg = C.none, fg = C.none } + G.NvimTreeSymlink = { fg = C.blue2 } + + -- Neo tree. + G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } + G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } + G.NeoTreeRootName = { fg = C.blue0 } + G.NeoTreeFileIcon = { fg = C.blue2 } + G.NeoTreeFileNameOpened = { fg = C.fg } + G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' } + G.NeoTreeGitAdded = { fg = C.git.add } + G.NeoTreeGitConflict = { fg = C.magenta.bright } + G.NeoTreeGitModified = { fg = C.git.change } + G.NeoTreeGitUntracked = { fg = C.red_b } + G.NeoTreeNormal = { link = 'NvimTreeNormal' } + G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } + G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } + G.NeoTreeTitleBar = { fg = C.orange_b } + + -- Noice Flat. + G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } + G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } + G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } + G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } + G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } + G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } + G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } + G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } + G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } + G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopup = { bg = C.bg_float } + + -- Noice Classic. + if O.noice.style == 'classic' then + G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlinePopup = { bg = C.bg } + G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } + end + + -- Nvim cmp. + G.CmpItemAbbrDeprecated = { fg = C.grey4 } + G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } + G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } + G.CmpItemKindField = { link = '@field' } + G.CmpItemKindProperty = { link = '@property' } + G.CmpItemKindEvent = { link = 'Type' } + G.CmpItemKindText = { fg = C.grey4 } + G.CmpItemKindEnum = { link = 'Type' } + G.CmpItemKindKeyword = { link = 'Keyword' } + G.CmpItemKindConstant = { link = 'Constant' } + G.CmpItemKindConstructor = { link = 'Function' } + G.CmpItemKindReference = { fg = C.cyan.base } + G.CmpItemKindFunction = { link = 'Function' } + G.CmpItemKindStruct = { link = 'Type' } + G.CmpItemKindClass = { link = 'Type' } + G.CmpItemKindModule = { fg = C.yellow.dim } + G.CmpItemKindOperator = { link = 'Operator' } + G.CmpItemKindVariable = { fg = C.cyan.base } + G.CmpItemKindFile = { fg = C.blue1 } + G.CmpItemKindUnit = { link = 'Constant' } + G.CmpItemKindSnippet = { fg = C.blue1 } + G.CmpItemKindFolder = { fg = C.yellow.dark } + G.CmpItemKindMethod = { link = 'Function' } + G.CmpItemKindValue = { link = 'Constant' } + G.CmpItemKindEnumMember = { link = 'Type' } + G.CmpItemKindInterface = { link = 'Type' } + G.CmpItemKindColor = { link = 'Constant' } + G.CmpItemKindTypeParameter = { link = 'Type' } + G.CmpItemKindTabNine = { fg = C.red.base } + G.CmpItemKindCopilot = { fg = C.red.base } + + -- Nvim DAP. + G.DapBreakPoint = { fg = C.red.bright } + + -- Nvim DAP UI. + G.DapUINormal = { bg = C.bg_float } + G.DapUIStop = { fg = C.red.bright, bold = true } + G.DapUIRestart = { fg = C.green.bright, bold = true } + G.DapUIPlayPause = { fg = C.green.bright, bold = true } + G.DapUIStepInto = { fg = C.blue2, bold = true } + G.DapUIStepOver = { fg = C.blue2, bold = true } + G.DapUIStepOut = { fg = C.blue2, bold = true } + G.DapUIStepBack = { fg = C.blue3, bold = true } + G.DapUIValue = { fg = C.magenta.bright } + G.DapUIWatchesValue = { fg = C.green.bright } + G.DapUIType = { fg = C.yellow.base } + G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } + G.DapUIFloatNormal = { bg = C.bg } + G.DapUILineNumber = { fg = C.green.bright } + + -- Notify. + G.NotifyBackground = { bg = C.bg_float } + G.NotifyERRORBorder = { fg = C.error } + G.NotifyERRORIcon = { fg = C.error } + G.NotifyERRORTitle = { fg = C.error, bold = true } + G.NotifyERRORBody = { fg = C.fg } + G.NotifyWARNBorder = { fg = C.warn } + G.NotifyWARNIcon = { fg = C.warn } + G.NotifyWARNTitle = { fg = C.warn, bold = true } + G.NotifyWARNBody = { fg = C.fg } + G.NotifyINFOBorder = { fg = C.info } + G.NotifyINFOIcon = { fg = C.info } + G.NotifyINFOTitle = { fg = C.info, bold = true } + G.NotifyINFOBody = { fg = C.fg } + G.NotifyDEBUGBorder = { fg = C.orange.bright } + G.NotifyDEBUGIcon = { fg = C.orange.bright } + G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } + G.NotifyDEBUGBody = { fg = C.fg } + G.NotifyTRACEBorder = { fg = C.gray5 } + G.NotifyTRACEIcon = { fg = C.gray5 } + G.NotifyTRACETitle = { fg = C.gray5, bold = true } + G.NotifyTRACEBody = { fg = C.fg } + + -- Telescope Classic. + G.TelescopeNormal = { bg = C.bg } + G.TelescopePromptNormal = { bg = C.bg } + G.TelescopeResultsNormal = { bg = C.bg } + G.TelescopePreviewNormal = { bg = C.bg } + G.TelescopePreviewLine = { bg = C.gray2 } + G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeBorder = { fg = C.white0, bg = C.bg } + G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } + G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } + G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } + G.TelescopeMatching = { bold = true } + G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopeMultiSelection = { bg = C.bg } + + -- Telescope Flat. + if O.telescope.style == 'flat' then + G.TelescopeNormal = { bg = C.bg_float } + G.TelescopePromptNormal = { bg = C.black2 } + G.TelescopeResultsNormal = { bg = C.bg_float } + G.TelescopePreviewNormal = { bg = C.bg_float } + G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } + G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeBorder = { fg = C.black0, bg = C.black0 } + G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } + G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopeMultiSelection = { bg = C.bg_float } + G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } + G.TelescopePreviewLine = { bg = C.gray1 } + end + + -- Treesitter. + -- LSP Semantic Token Groups + -- Types follow the pattern @lsp.type.. + -- These groups are for the Neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + --- Misc + G['@comment'] = { link = 'Comment' } + --G['@comment.documentation'] = { link = 'Comment' } + G['@comment.documentation'] = { link = 'Comment' } + G['@comment.note'] = { fg = C.hint } + G['@comment.error'] = { fg = C.error } + G['@comment.hint'] = { fg = C.hint } + G['@comment.info'] = { fg = C.info } + G['@comment.warning'] = { fg = C.warning } + G['@comment.todo'] = { fg = C.todo } + G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. + --- Punctuation + G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` + G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. + G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. + G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } + --- Literals + G['@string'] = { link = 'String' } + G['@string.documentation'] = { link = 'String' } + G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. + G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. + --- Functions + G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. + G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] + --- Keywords + G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. + G['@keyword.conditional'] = { link = 'Conditional' } + G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. + G['@keyword.debug'] = { link = 'Debug' } + G['@keyword.directive'] = { link = 'PreProc' } + G['@keyword.directive.define'] = { link = 'Define' } + G['@keyword.exception'] = { link = 'Exception' } + G['@keyword.export'] = { link = 'Keyword' } + G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. + G['@keyword.import'] = { link = 'Include' } + G['@keyword.operator'] = { link = 'Keyword' } + G['@keyword.repeat'] = { link = 'Repeat' } + G['@keyword.return'] = { link = 'Keyword' } + G['@keyword.storage'] = { link = 'StorageClass' } + G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. + --- Types + G['@type.builtin'] = { link = 'Type' } + G['@field'] = { link = 'Field' } -- For fields. + G['@property'] = { link = 'Field' } + --- Identifiers + G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. + G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. + G['@variable.member'] = { link = 'Field' } + --- Text + -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text + -- G["@text.literal.markdown"] = { } + G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. + G['@text.strong'] = { bold = true } + G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. + G['@text.underline'] = { underline = true } -- For text to be represented with an underline. + G['@text.strike'] = { strikethrough = true } -- For strikethrough text. + G['@text.title'] = { link = 'Title' } -- Text that is part of a title. + G['@text.uri'] = { underline = true } -- Any URI like a link or email. + G['@text.literal'] = { link = 'String' } + G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@text.reference'] = { link = 'Link' } + G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. + G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. + G['@text.warning'] = { fg = C.warning } + G['@text.danger'] = { fg = C.error } + G['@text.diff.add'] = { link = 'DiffAdd' } + G['@text.diff.delete'] = { link = 'DiffDelete' } + G['@text.todo'] = { link = 'Todo' } + G['@text.note'] = { link = 'Note' } + --- Markup + G['@markup'] = { link = '@none' } + G['@markup.emphasis'] = { italic = true } + G['@markup.environment'] = { link = 'Macro' } + G['@markup.environment.name'] = { link = 'Type' } + G['@markup.heading'] = { link = 'Title' } + G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } + G['@markup.heading.2'] = { fg = C.orange.base, bold = true } + G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } + G['@markup.heading.4'] = { fg = C.green.base } + G['@markup.heading.5'] = { fg = C.blue2, italic = true } + G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } + G['@markup.italic'] = { italic = true } + G['@markup.list'] = { link = '@operator' } + G['@markup.list.checked'] = { link = 'Field' } + G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } + G['@markup.list.unchecked'] = { fg = C.fg } + G['@markup.link'] = { fg = C.cyan.base } + G['@markup.link.label'] = { link = 'SpecialChar' } + G['@markup.link.label.symbol'] = { link = 'Identifier' } + G['@markup.link.url'] = { link = 'Underlined' } + G['@markup.math'] = { link = 'Special' } + G['@markup.raw'] = { link = 'String' } + G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@markup.strong'] = { bold = true } + G['@markup.strikethrough'] = { strikethrough = true } + G['@markup.underline'] = { underline = true } + -- TSX + G['@tag.tsx'] = { fg = C.blue1 } + G['@constructor.tsx'] = { fg = C.blue1 } + G['@tag.delimiter.tsx'] = { fg = C.blue1 } + --LSP Semantic Token Groups + G['@lsp.type.boolean'] = { link = 'Boolean' } + G['@lsp.type.builtinType'] = { link = 'Type' } + G['@lsp.type.comment'] = { link = 'Comment' } + G['@lsp.type.enum'] = { link = 'Type' } + G['@lsp.type.enumMember'] = { link = 'Field' } + G['@lsp.type.escapeSequence'] = { link = '@string.escape' } + G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } + G['@lsp.type.interface'] = { link = 'Keyword' } + G['@lsp.type.keyword'] = { link = 'Keyword' } + G['@lsp.type.namespace'] = { link = 'Namespace' } + G['@lsp.type.number'] = { link = 'Number' } + G['@lsp.type.operator'] = { link = '@operator' } + G['@lsp.type.parameter'] = { link = '@parameter' } + G['@lsp.type.property'] = { link = '@property' } + G['@lsp.type.selfKeyword'] = { link = 'Builtin' } + G['@lsp.type.string.rust'] = { link = 'String' } + G['@lsp.type.typeAlias'] = { link = 'Type' } + G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } + G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables + G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } + G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.keyword.async'] = { link = 'Macro' } + G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } + G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.operator.injected'] = { link = 'Operator' } + G['@lsp.typemod.string.injected'] = { link = 'String' } + G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } + G['@lsp.typemod.variable.injected'] = { link = 'Variable' } + G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } + -- Things that seems to be missing? + G['@annotation'] = { link = 'PreProc' } + G['@diff.plus'] = { link = 'DiffAdd' } + G['@diff.minus'] = { link = 'DiffDelete' } + G['@diff.delta'] = { link = 'DiffChange' } + G['@character'] = { link = 'Character' } + G['@character.special'] = { link = 'SpecialChar' } + G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. + G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. + G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` + G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` + G['@constant'] = { link = 'Constant' } + G['@number'] = { link = 'Constant' } + G['@float'] = { link = 'Constant' } + G['@boolean'] = { link = 'Constant' } + G['@constant.macro'] = { link = 'Constant' } + G['@constant.builtin'] = { link = 'Constant' } + G['@repeat'] = { link = 'Keyword' } + G['@conditional'] = { link = 'Keyword' } + G['@class'] = { link = 'Keyword' } + G['@include'] = { link = 'Include' } + G['@macro'] = { link = 'Macro' } + G['@module'] = { fg = C.yellow.base } + G['@module.builtin'] = { link = 'Builtin' } + G['@preproc'] = { link = 'Macro' } + G['@attribute'] = { link = 'Macro' } + G['@function.macro'] = { link = 'Macro' } + G['@define'] = { link = 'Macro' } + G['@exception'] = { link = 'Macro' } + G['@function'] = { link = 'Function' } + G['@method'] = { link = 'Function' } + G['@method.call'] = { link = 'Function' } + G['@function.call'] = { link = 'Function' } + G['@function.builtin'] = { link = 'Function' } + G['@property.cpp'] = { fg = C.cyan.base } + G['@namespace'] = { fg = C.yellow.dim } + G['@type'] = { link = 'Type' } + G['@type.definition'] = { link = 'Type' } + G['@type.qualifier'] = { link = 'Keyword' } + G['@storageclass'] = { link = 'Keyword' } + G['@none'] = { link = 'None' } + + -- Treesitter context. + local bg + local fg + if O.ts_context.dark_background then + bg = C.black1 + fg = C.gray1 + else + bg = C.gray1 + fg = C.gray4 + end + G.TreesitterContext = { bg = bg } + G.TreesitterContextLineNumber = { fg = fg, bg = bg } + + -- Neorg + G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } + G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } + G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } + G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } + G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } + G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } + G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } + G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } + G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } + G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } + G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } + G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } + + -- Trouble. + G.TroubleNormal = { bg = C.bg_float } + G.TroubleText = { fg = C.fg } + G.TroubleCount = { fg = C.white1, bg = C.gray2 } + G.TroubleIndent = { fg = C.gray1 } + G.TroubleFile = { fg = C.cyan.bright } + G.TroubleFoldIcon = { fg = C.gray1 } + + -- Vimtex. + G.texGroup = { fg = C.fg } + G.texEnvArgName = { fg = C.cyan.base } + G.texMathEnvArgName = { link = 'texEnvArgName' } + G.texArg = { fg = C.cyan.base } + G.texStyleItal = { fg = C.fg, italic = true } + G.texPartArgTitle = { fg = C.cyan.base } + G.texDelim = { fg = C.fg } + G.texMathGroup = { fg = C.fg } + G.texMathArg = { fg = C.fg } + G.texMathZoneEnv = { fg = C.fg } + G.texMathZoneTI = { fg = C.fg } + G.texMathDelim = { fg = C.fg } + G.texMathDelimZoneTI = { fg = C.blue2 } + G.texMathSuper = { fg = C.fg } + G.texFileArg = { fg = C.green.base } + G.texRefArg = { fg = C.magenta.bright } + G.texGroupError = { link = 'DiagnosticError' } + G.texMathSub = { fg = C.fg } + G.texCmdEnv = { fg = C.blue2 } + G.texSpecialChar = { fg = C.orange.base } + G.texLigature = { fg = C.fg } + G.texFileOpt = { fg = C.fg } + G.texVerbZone = { link = 'String' } + G.texLstZone = { link = 'String' } + + -- Whichkey. + G.WhichKey = { fg = C.yellow.base } + G.WhichKeyFloat = { bg = C.bg_float } + G.WhichKeyDesc = { fg = C.white0 } + G.WhichKeyGroup = { fg = C.orange.bright, bold = true } + G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } + -- TODO: Unsure. + G.WhichKeySeperator = {} + G.WhichKeyValue = {} + + -- Rainbow delimiters + G.RainbowDelimiterOrange = { fg = C.orange.base } + G.RainbowDelimiterYellow = { fg = C.yellow.bright } + G.RainbowDelimiterBlue = { fg = C.blue2 } + G.RainbowDelimiterRed = { fg = C.red.bright } + G.RainbowDelimiterGreen = { fg = C.green.bright } + + return G end return M From 3027f290bbabcd066d0d58ae585611afc37518e7 Mon Sep 17 00:00:00 2001 From: bini-x Date: Thu, 26 Sep 2024 15:50:09 +0200 Subject: [PATCH 03/15] changed some neotree colors --- lua/nordic/groups/integrations.lua | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index c32bfa4..f3ca14b 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -148,10 +148,10 @@ function M.get_groups() -- Noice Classic. if O.noice.style == 'classic' then - G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlinePopup = { bg = C.bg } - G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } + G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlinePopup = { bg = C.bg } + G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } end -- Nvim cmp. @@ -251,24 +251,24 @@ function M.get_groups() -- Telescope Flat. if O.telescope.style == 'flat' then - G.TelescopeNormal = { bg = C.bg_float } - G.TelescopePromptNormal = { bg = C.black2 } - G.TelescopeResultsNormal = { bg = C.bg_float } - G.TelescopePreviewNormal = { bg = C.bg_float } - G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } - G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeBorder = { fg = C.black0, bg = C.black0 } - G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } - G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopeMultiSelection = { bg = C.bg_float } - G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } - G.TelescopePreviewLine = { bg = C.gray1 } + G.TelescopeNormal = { bg = C.bg_float } + G.TelescopePromptNormal = { bg = C.black2 } + G.TelescopeResultsNormal = { bg = C.bg_float } + G.TelescopePreviewNormal = { bg = C.bg_float } + G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } + G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeBorder = { fg = C.black0, bg = C.black0 } + G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } + G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopeMultiSelection = { bg = C.bg_float } + G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } + G.TelescopePreviewLine = { bg = C.gray1 } end -- Treesitter. @@ -456,11 +456,11 @@ function M.get_groups() local bg local fg if O.ts_context.dark_background then - bg = C.black1 - fg = C.gray1 + bg = C.black1 + fg = C.gray1 else - bg = C.gray1 - fg = C.gray4 + bg = C.gray1 + fg = C.gray4 end G.TreesitterContext = { bg = bg } G.TreesitterContextLineNumber = { fg = fg, bg = bg } From b680b0475a2ee6d22829a2b43d16935381b7a5c3 Mon Sep 17 00:00:00 2001 From: bini-x Date: Thu, 26 Sep 2024 16:12:18 +0200 Subject: [PATCH 04/15] fixed the formatting --- lua/nordic/groups/integrations.lua | 114 ++++++++++++++--------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index f3ca14b..e7c8e04 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -3,9 +3,9 @@ local M = {} function M.get_groups() local C = require('nordic.colors') local O = require('nordic.config').options - + local G = {} - + -- Dashboard.lua G.DashboardHeader = { fg = C.yellow.base, bold = true } G.DashboardFooter = { fg = C.cyan.base } @@ -20,26 +20,26 @@ function M.get_groups() G.DashboardDesc = { fg = C.green.base } G.DashboardKey = { fg = C.red.base, bold = true } G.DashboardIcon = { fg = C.green.base } - + -- Diffview. G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } G.DiffviewStatusLine = { bg = C.black0 } G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } G.DiffviewFolderSign = { fg = C.yellow.dim } G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } - + -- Gitsigns. G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } G.GitSignsAddPreview = { link = 'GitSignsAdd' } G.GitSignsDeletePreview = { link = 'GitSignsDelete' } - + -- Indent blankline. G.IndentBlanklineChar = { fg = C.gray1 } G.IndentBlanklineContextChar = { fg = C.gray2 } G.IndentBlanklineContextStart = { sp = C.white0, underline = true } - + -- Lazy. G.LazyH1 = { fg = C.yellow.base, bold = true } G.LazyButtonActive = { link = 'LazyH1' } @@ -48,14 +48,14 @@ function M.get_groups() G.LazyProgressDone = { fg = C.green.bright } G.LazyProgressTodo = { fg = C.gray4 } G.LazyCommitType = { fg = C.yellow.base } - + -- Leap. G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end - + -- LSP Signature. G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } - + -- LSP Saga. G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } G.SagaNormal = { bg = C.black2 } @@ -83,7 +83,7 @@ function M.get_groups() G.DiagnosticShowNormal = { link = 'NormalFloat' } G.DiagnosticShowBorder = { link = 'FloatBorder' } G.DiagnosticBorder = { link = 'FloatBorder' } - + -- Mini Statusline. local LC = require('lualine.themes.nordic') G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } @@ -96,7 +96,7 @@ function M.get_groups() G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } - + -- Nvim tree. G.NvimTreeNormal = { fg = C.fg, bg = C.bg } G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg } @@ -115,7 +115,7 @@ function M.get_groups() G.NvimTreeCursorLine = { bg = C.gray1 } G.NvimTreeCursor = { bg = C.none, fg = C.none } G.NvimTreeSymlink = { fg = C.blue2 } - + -- Neo tree. G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } @@ -131,7 +131,7 @@ function M.get_groups() G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } G.NeoTreeTitleBar = { fg = C.orange_b } - + -- Noice Flat. G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } @@ -145,7 +145,7 @@ function M.get_groups() G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } G.NoiceCmdlinePopup = { bg = C.bg_float } - + -- Noice Classic. if O.noice.style == 'classic' then G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } @@ -153,7 +153,7 @@ function M.get_groups() G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } end - + -- Nvim cmp. G.CmpItemAbbrDeprecated = { fg = C.grey4 } G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } @@ -185,10 +185,10 @@ function M.get_groups() G.CmpItemKindTypeParameter = { link = 'Type' } G.CmpItemKindTabNine = { fg = C.red.base } G.CmpItemKindCopilot = { fg = C.red.base } - + -- Nvim DAP. G.DapBreakPoint = { fg = C.red.bright } - + -- Nvim DAP UI. G.DapUINormal = { bg = C.bg_float } G.DapUIStop = { fg = C.red.bright, bold = true } @@ -204,7 +204,7 @@ function M.get_groups() G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } G.DapUIFloatNormal = { bg = C.bg } G.DapUILineNumber = { fg = C.green.bright } - + -- Notify. G.NotifyBackground = { bg = C.bg_float } G.NotifyERRORBorder = { fg = C.error } @@ -227,7 +227,7 @@ function M.get_groups() G.NotifyTRACEIcon = { fg = C.gray5 } G.NotifyTRACETitle = { fg = C.gray5, bold = true } G.NotifyTRACEBody = { fg = C.fg } - + -- Telescope Classic. G.TelescopeNormal = { bg = C.bg } G.TelescopePromptNormal = { bg = C.bg } @@ -248,7 +248,7 @@ function M.get_groups() G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } G.TelescopeMultiSelection = { bg = C.bg } - + -- Telescope Flat. if O.telescope.style == 'flat' then G.TelescopeNormal = { bg = C.bg_float } @@ -270,7 +270,7 @@ function M.get_groups() G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } G.TelescopePreviewLine = { bg = C.gray1 } end - + -- Treesitter. -- LSP Semantic Token Groups -- Types follow the pattern @lsp.type.. @@ -286,60 +286,60 @@ function M.get_groups() G['@comment.info'] = { fg = C.info } G['@comment.warning'] = { fg = C.warning } G['@comment.todo'] = { fg = C.todo } - G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. + G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. --- Punctuation - G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` - G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. - G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. + G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` + G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. + G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } --- Literals G['@string'] = { link = 'String' } G['@string.documentation'] = { link = 'String' } - G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. - G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. + G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. + G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. --- Functions - G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. - G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] + G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. + G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] --- Keywords - G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. + G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. G['@keyword.conditional'] = { link = 'Conditional' } - G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. + G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. G['@keyword.debug'] = { link = 'Debug' } G['@keyword.directive'] = { link = 'PreProc' } G['@keyword.directive.define'] = { link = 'Define' } G['@keyword.exception'] = { link = 'Exception' } G['@keyword.export'] = { link = 'Keyword' } - G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. + G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. G['@keyword.import'] = { link = 'Include' } G['@keyword.operator'] = { link = 'Keyword' } G['@keyword.repeat'] = { link = 'Repeat' } G['@keyword.return'] = { link = 'Keyword' } G['@keyword.storage'] = { link = 'StorageClass' } - G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. + G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. --- Types G['@type.builtin'] = { link = 'Type' } - G['@field'] = { link = 'Field' } -- For fields. + G['@field'] = { link = 'Field' } -- For fields. G['@property'] = { link = 'Field' } --- Identifiers - G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. - G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. + G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. + G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. G['@variable.member'] = { link = 'Field' } --- Text -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text -- G["@text.literal.markdown"] = { } - G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. + G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. G['@text.strong'] = { bold = true } - G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. - G['@text.underline'] = { underline = true } -- For text to be represented with an underline. - G['@text.strike'] = { strikethrough = true } -- For strikethrough text. - G['@text.title'] = { link = 'Title' } -- Text that is part of a title. - G['@text.uri'] = { underline = true } -- Any URI like a link or email. + G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. + G['@text.underline'] = { underline = true } -- For text to be represented with an underline. + G['@text.strike'] = { strikethrough = true } -- For strikethrough text. + G['@text.title'] = { link = 'Title' } -- Text that is part of a title. + G['@text.uri'] = { underline = true } -- Any URI like a link or email. G['@text.literal'] = { link = 'String' } G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } G['@text.reference'] = { link = 'Link' } - G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. - G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. + G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. + G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. G['@text.warning'] = { fg = C.warning } G['@text.danger'] = { fg = C.error } G['@text.diff.add'] = { link = 'DiffAdd' } @@ -396,7 +396,7 @@ function M.get_groups() G['@lsp.type.string.rust'] = { link = 'String' } G['@lsp.type.typeAlias'] = { link = 'Type' } G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } - G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables + G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } @@ -417,10 +417,10 @@ function M.get_groups() G['@diff.delta'] = { link = 'DiffChange' } G['@character'] = { link = 'Character' } G['@character.special'] = { link = 'SpecialChar' } - G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. - G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. - G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` - G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` + G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. + G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. + G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` + G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` G['@constant'] = { link = 'Constant' } G['@number'] = { link = 'Constant' } G['@float'] = { link = 'Constant' } @@ -451,7 +451,7 @@ function M.get_groups() G['@type.qualifier'] = { link = 'Keyword' } G['@storageclass'] = { link = 'Keyword' } G['@none'] = { link = 'None' } - + -- Treesitter context. local bg local fg @@ -464,7 +464,7 @@ function M.get_groups() end G.TreesitterContext = { bg = bg } G.TreesitterContextLineNumber = { fg = fg, bg = bg } - + -- Neorg G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } @@ -478,7 +478,7 @@ function M.get_groups() G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } - + -- Trouble. G.TroubleNormal = { bg = C.bg_float } G.TroubleText = { fg = C.fg } @@ -486,7 +486,7 @@ function M.get_groups() G.TroubleIndent = { fg = C.gray1 } G.TroubleFile = { fg = C.cyan.bright } G.TroubleFoldIcon = { fg = C.gray1 } - + -- Vimtex. G.texGroup = { fg = C.fg } G.texEnvArgName = { fg = C.cyan.base } @@ -512,7 +512,7 @@ function M.get_groups() G.texFileOpt = { fg = C.fg } G.texVerbZone = { link = 'String' } G.texLstZone = { link = 'String' } - + -- Whichkey. G.WhichKey = { fg = C.yellow.base } G.WhichKeyFloat = { bg = C.bg_float } @@ -522,14 +522,14 @@ function M.get_groups() -- TODO: Unsure. G.WhichKeySeperator = {} G.WhichKeyValue = {} - + -- Rainbow delimiters G.RainbowDelimiterOrange = { fg = C.orange.base } G.RainbowDelimiterYellow = { fg = C.yellow.bright } G.RainbowDelimiterBlue = { fg = C.blue2 } G.RainbowDelimiterRed = { fg = C.red.bright } G.RainbowDelimiterGreen = { fg = C.green.bright } - + return G end From 9e49ff1f4c7db71347a7f26281861dc353efc4c2 Mon Sep 17 00:00:00 2001 From: bini-x Date: Thu, 26 Sep 2024 17:18:25 +0200 Subject: [PATCH 05/15] improved some colors --- lua/nordic/groups/integrations.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index e7c8e04..a617896 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -119,18 +119,19 @@ function M.get_groups() -- Neo tree. G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } - G.NeoTreeRootName = { fg = C.blue0 } + G.NeoTreeRootName = { fg = C.white2 } G.NeoTreeFileIcon = { fg = C.blue2 } G.NeoTreeFileNameOpened = { fg = C.fg } G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' } G.NeoTreeGitAdded = { fg = C.git.add } G.NeoTreeGitConflict = { fg = C.magenta.bright } G.NeoTreeGitModified = { fg = C.git.change } - G.NeoTreeGitUntracked = { fg = C.red_b } + G.NeoTreeGitUntracked = { fg = C.orange } G.NeoTreeNormal = { link = 'NvimTreeNormal' } G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } - G.NeoTreeTitleBar = { fg = C.orange_b } + G.NeoTreeTitleBar = { fg = C.gray2, bg = C.white3 } + G.NeoTreeFloatBorder = { fg = C.white3 } -- Noice Flat. G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } From aa7188529a4463c582f6cc3aebd360e5a8c3a200 Mon Sep 17 00:00:00 2001 From: bini-x Date: Fri, 27 Sep 2024 09:18:30 +0200 Subject: [PATCH 06/15] fixed orange --- lua/nordic/groups/integrations.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index a617896..2aba880 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -126,12 +126,12 @@ function M.get_groups() G.NeoTreeGitAdded = { fg = C.git.add } G.NeoTreeGitConflict = { fg = C.magenta.bright } G.NeoTreeGitModified = { fg = C.git.change } - G.NeoTreeGitUntracked = { fg = C.orange } + G.NeoTreeGitUntracked = { fg = C.orange.base } G.NeoTreeNormal = { link = 'NvimTreeNormal' } G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } G.NeoTreeTitleBar = { fg = C.gray2, bg = C.white3 } - G.NeoTreeFloatBorder = { fg = C.white3 } + G.NeoTreeFloatBorder = { fg = C.white3, bg = C.gray0 } -- Noice Flat. G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } From 78c8cefbed48fef8322ef9ee0d0f3b9079330dae Mon Sep 17 00:00:00 2001 From: bini-x Date: Sat, 28 Sep 2024 11:39:00 +0200 Subject: [PATCH 07/15] added G.Tree... styles --- lua/nordic/groups/integrations.lua | 45 +++++++++++++++++++----------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 2aba880..0771ef7 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -97,41 +97,54 @@ function M.get_groups() G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } + + -- Tree Groups + G.TreeNormal = { fg = C.fg, bg = C.bg } + G.TreeNormalNC = { fg = C.fg, bg = C.bg } + G.TreeRootName = { fg = C.white2 } + G.TreeGitUntracked = { fg = C.orange.base } + G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } + G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } + G.TreeCursorLine = { bg = C.gray1 } + G.TreeFolderIcon = { fg = C.yellow.dim } + G.TreeIndentMarker = { fg = C.gray4 } + G.TreeSymlink = { fg = C.blue2 } + -- Nvim tree. - G.NvimTreeNormal = { fg = C.fg, bg = C.bg } - G.NvimTreeNormalNC = { fg = C.fg, bg = C.bg } + G.NvimTreeNormal = { link = 'TreeNormal' } + G.NvimTreeNormalNC = { link = 'TreeNormalNC' } G.NvimTreeFolderName = { fg = C.blue1 } G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' } G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' } - G.NvimTreeFolderIcon = { fg = C.yellow.dim } + G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' } G.NvimTreeSpecialFile = { fg = C.magenta.bright } G.NvimTreeRootFolder = { fg = C.gray4 } G.NvimTreeGitDirty = { fg = C.gray4 } G.NvimTreeGitNew = { fg = C.gray4 } G.NvimTreeGitDeleted = { fg = C.gray4 } G.NvimTreeGitStaged = { fg = C.gray4 } - G.NvimTreeIndentMarker = { fg = C.gray4 } + G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' } G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg } - G.NvimTreeCursorLine = { bg = C.gray1 } + G.NvimTreeCursorLine = { link = 'TreeCursorLine' } G.NvimTreeCursor = { bg = C.none, fg = C.none } - G.NvimTreeSymlink = { fg = C.blue2 } + G.NvimTreeSymlink = { link = 'TreeSymlink' } -- Neo tree. - G.NeoTreeCursorLine = { link = 'NvimTreeCursorLine' } - G.NeoTreeDirectoryIcon = { link = 'NvimTreeFolderIcon' } - G.NeoTreeRootName = { fg = C.white2 } + G.NeoTreeCursorLine = { link = 'TreeCursorLine' } + G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' } + G.NeoTreeRootName = { link = 'TreeRootName' } G.NeoTreeFileIcon = { fg = C.blue2 } G.NeoTreeFileNameOpened = { fg = C.fg } - G.NeoTreeIndentMarker = { link = 'NvimTreeIndentMarker' } + G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' } G.NeoTreeGitAdded = { fg = C.git.add } G.NeoTreeGitConflict = { fg = C.magenta.bright } G.NeoTreeGitModified = { fg = C.git.change } - G.NeoTreeGitUntracked = { fg = C.orange.base } - G.NeoTreeNormal = { link = 'NvimTreeNormal' } - G.NeoTreeNormalNC = { link = 'NvimTreeNormalNC' } - G.NeoTreeSymbolicLinkTarget = { link = 'NvimTreeSymlink' } - G.NeoTreeTitleBar = { fg = C.gray2, bg = C.white3 } - G.NeoTreeFloatBorder = { fg = C.white3, bg = C.gray0 } + G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' } + G.NeoTreeNormal = { link = 'TreeNormal' } + G.NeoTreeNormalNC = { link = 'TreeNormalNC' } + G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' } + G.NeoTreeTitleBar = { link = 'TreeTitleBar' } + G.NeoTreeFloatBorder = { link = 'TreeFloatBorder' } -- Noice Flat. G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } From 1a78afca9916e5b3ab8d111cbb1203ea19b77b76 Mon Sep 17 00:00:00 2001 From: bini-x Date: Sat, 28 Sep 2024 11:42:53 +0200 Subject: [PATCH 08/15] just removed some white spaces --- lua/nordic/groups/integrations.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 0771ef7..22843af 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -97,7 +97,6 @@ function M.get_groups() G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } - -- Tree Groups G.TreeNormal = { fg = C.fg, bg = C.bg } G.TreeNormalNC = { fg = C.fg, bg = C.bg } From b8731e7b47e9cb8267c03682187d105547257df5 Mon Sep 17 00:00:00 2001 From: bini-x Date: Sat, 28 Sep 2024 12:25:35 +0200 Subject: [PATCH 09/15] fixed. maybe...:) --- lua/nordic/groups/integrations.lua | 62 ++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 22843af..c0dd8e1 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -100,45 +100,75 @@ function M.get_groups() -- Tree Groups G.TreeNormal = { fg = C.fg, bg = C.bg } G.TreeNormalNC = { fg = C.fg, bg = C.bg } + G.TreeRootFolder = { fg = C.gray4 } G.TreeRootName = { fg = C.white2 } + G.TreeFileIcon = { fg = C.blue2 } + G.TreeFileNameOpened = { fg = C.fg } + G.TreeSpecialFile = { fg = C.magenta.bright } + G.TreeGitConflict = { fg = C.magenta.bright } + G.TreeGitModified = { fg = C.git.change } + G.TreeGitDirty = { fg = C.gray4 } + G.TreeGitAdded = { fg = C.git.add } + G.TreeGitNew = { fg = C.gray4 } + G.TreeGitDeleted = { fg = C.gray4 } + G.TreeGitStaged = { fg = C.gray4 } G.TreeGitUntracked = { fg = C.orange.base } G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } G.TreeCursorLine = { bg = C.gray1 } + G.TreeCursor = { bg = C.none, fg = C.none } G.TreeFolderIcon = { fg = C.yellow.dim } G.TreeIndentMarker = { fg = C.gray4 } G.TreeSymlink = { fg = C.blue2 } + G.TreeFolderName = { fg = C.blue1 } + G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg } -- Nvim tree. G.NvimTreeNormal = { link = 'TreeNormal' } G.NvimTreeNormalNC = { link = 'TreeNormalNC' } - G.NvimTreeFolderName = { fg = C.blue1 } - G.NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' } - G.NvimTreeEmptyFolderName = { link = 'NvimTreeFolderName' } + G.NvimTreeFolderName = { link = 'TreeFolderName'} + G.NvimTreeOpenedFolderName = { link = 'TreeFolderName' } + G.NvimTreeEmptyFolderName = { link = 'TreeFolderName' } G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' } - G.NvimTreeSpecialFile = { fg = C.magenta.bright } - G.NvimTreeRootFolder = { fg = C.gray4 } - G.NvimTreeGitDirty = { fg = C.gray4 } - G.NvimTreeGitNew = { fg = C.gray4 } - G.NvimTreeGitDeleted = { fg = C.gray4 } - G.NvimTreeGitStaged = { fg = C.gray4 } + G.NvimTreeFileIcon = { link = 'TreeFileIcon' } + G.NvimTreeFileNameOpened = { link = 'TreeFileNameOpened' } + G.NvimTreeSpecialFile = { link = 'TreeSpecialFile' } + G.NvimTreeRootFolder = { link = 'TreeRootFolder' } + G.NvimTreeGitDirty = { link = 'TreeGitDirty' } + G.NvimTreeGitAdded = { link = 'TreeGitAdded' } + G.NvimTreeGitNew = { link = 'TreeGitNew' } + G.NvimTreeGitDeleted = { link = 'TreeGitDeleted' } + G.NvimTreeGitStaged = { link = 'TreeGitStaged' } + G.NvimTreeGitConflict = { link = 'TreeGitConflict' } + G.NvimTreeGitModified = { link = 'TreeGitModified' } G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' } - G.NvimTreeWinSeparator = { fg = C.bg_dark, bg = C.bg } + G.NvimTreeWinSeparator = { link = 'TreeWinSeparator' } G.NvimTreeCursorLine = { link = 'TreeCursorLine' } - G.NvimTreeCursor = { bg = C.none, fg = C.none } + G.NvimTreeCursor = { link = 'TreeCursor' } G.NvimTreeSymlink = { link = 'TreeSymlink' } -- Neo tree. G.NeoTreeCursorLine = { link = 'TreeCursorLine' } G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' } G.NeoTreeRootName = { link = 'TreeRootName' } - G.NeoTreeFileIcon = { fg = C.blue2 } - G.NeoTreeFileNameOpened = { fg = C.fg } + G.NeoTreeRootFolder = { link = 'TreeRootFolder' } + G.NeoTreeFileIcon = { link = 'TreeFileIcon' } + G.NeoTreeFileNameOpened = { link = 'TreeFileNameOpened'} + G.NeoTreeFolderName = { link = 'TreeFolderName' } + G.NeoTreeOpenedFolderName = { link = 'TreeFolderName' } + G.NeoTreeEmptyFolderName = { link = 'TreeFolderName' } + G.NeoTreeSpecialFile = { link = 'TreeSpecialFile' } G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' } - G.NeoTreeGitAdded = { fg = C.git.add } - G.NeoTreeGitConflict = { fg = C.magenta.bright } - G.NeoTreeGitModified = { fg = C.git.change } + G.NeoTreeGitAdded = { link = 'TreeGitAdded' } + G.NeoTreeGitNew = { link = 'TreeGitNew' } + G.NeoTreeGitDirty = { link = 'TreeGitDirty' } + G.NeoTreeGitDeleted = { link = 'TreeGitDeleted' } + G.NeoTreeGitStaged = { link = 'TreeGitStaged' } + G.NeoTreeGitConflict = { link = 'TreeGitConflict'} + G.NeoTreeGitModified = { link = 'TreeGitModified' } G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' } + G.NeoTreeWinSeparator = { link = 'TreeWinSeparator' } + G.NeoTreeCursor = { link = 'TreeCursor' } G.NeoTreeNormal = { link = 'TreeNormal' } G.NeoTreeNormalNC = { link = 'TreeNormalNC' } G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' } From 4826461e35a77cf44a6a190024d02de07d30fe99 Mon Sep 17 00:00:00 2001 From: bini-x Date: Sun, 29 Sep 2024 19:12:16 +0200 Subject: [PATCH 10/15] changed TreeCursorLine bg --- lua/nordic/groups/integrations.lua | 1088 ++++++++++++++-------------- 1 file changed, 544 insertions(+), 544 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index c0dd8e1..9a5af40 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -1,579 +1,579 @@ local M = {} function M.get_groups() - local C = require('nordic.colors') - local O = require('nordic.config').options + local C = require('nordic.colors') + local O = require('nordic.config').options - local G = {} + local G = {} - -- Dashboard.lua - G.DashboardHeader = { fg = C.yellow.base, bold = true } - G.DashboardFooter = { fg = C.cyan.base } - G.DashboardCenter = { fg = C.green.base } - G.DashboardShortCut = { fg = C.gray4, bold = true } - G.DashboardProjectTitle = { fg = C.orange.base, bold = true } - G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } - G.DashboardProjectIcon = { fg = C.magenta.bright } - G.DashboardMruTitle = { link = 'DashboardProjectTitle' } - G.DashboardMruIcon = {} - G.DashboardFiles = { fg = C.fg } - G.DashboardDesc = { fg = C.green.base } - G.DashboardKey = { fg = C.red.base, bold = true } - G.DashboardIcon = { fg = C.green.base } + -- Dashboard.lua + G.DashboardHeader = { fg = C.yellow.base, bold = true } + G.DashboardFooter = { fg = C.cyan.base } + G.DashboardCenter = { fg = C.green.base } + G.DashboardShortCut = { fg = C.gray4, bold = true } + G.DashboardProjectTitle = { fg = C.orange.base, bold = true } + G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } + G.DashboardProjectIcon = { fg = C.magenta.bright } + G.DashboardMruTitle = { link = 'DashboardProjectTitle' } + G.DashboardMruIcon = {} + G.DashboardFiles = { fg = C.fg } + G.DashboardDesc = { fg = C.green.base } + G.DashboardKey = { fg = C.red.base, bold = true } + G.DashboardIcon = { fg = C.green.base } - -- Diffview. - G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } - G.DiffviewStatusLine = { bg = C.black0 } - G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } - G.DiffviewFolderSign = { fg = C.yellow.dim } - G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } + -- Diffview. + G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } + G.DiffviewStatusLine = { bg = C.black0 } + G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } + G.DiffviewFolderSign = { fg = C.yellow.dim } + G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } - -- Gitsigns. - G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } - G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } - G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } - G.GitSignsAddPreview = { link = 'GitSignsAdd' } - G.GitSignsDeletePreview = { link = 'GitSignsDelete' } + -- Gitsigns. + G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } + G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } + G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } + G.GitSignsAddPreview = { link = 'GitSignsAdd' } + G.GitSignsDeletePreview = { link = 'GitSignsDelete' } - -- Indent blankline. - G.IndentBlanklineChar = { fg = C.gray1 } - G.IndentBlanklineContextChar = { fg = C.gray2 } - G.IndentBlanklineContextStart = { sp = C.white0, underline = true } + -- Indent blankline. + G.IndentBlanklineChar = { fg = C.gray1 } + G.IndentBlanklineContextChar = { fg = C.gray2 } + G.IndentBlanklineContextStart = { sp = C.white0, underline = true } - -- Lazy. - G.LazyH1 = { fg = C.yellow.base, bold = true } - G.LazyButtonActive = { link = 'LazyH1' } - G.LazyButton = { fg = C.white0 } - G.LazySpecial = { fg = C.yellow.base } - G.LazyProgressDone = { fg = C.green.bright } - G.LazyProgressTodo = { fg = C.gray4 } - G.LazyCommitType = { fg = C.yellow.base } + -- Lazy. + G.LazyH1 = { fg = C.yellow.base, bold = true } + G.LazyButtonActive = { link = 'LazyH1' } + G.LazyButton = { fg = C.white0 } + G.LazySpecial = { fg = C.yellow.base } + G.LazyProgressDone = { fg = C.green.bright } + G.LazyProgressTodo = { fg = C.gray4 } + G.LazyCommitType = { fg = C.yellow.base } - -- Leap. - G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } - if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end + -- Leap. + G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } + if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end - -- LSP Signature. - G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } + -- LSP Signature. + G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } - -- LSP Saga. - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } + -- LSP Saga. + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } - -- Mini Statusline. - local LC = require('lualine.themes.nordic') - G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } - G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } - G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } - G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } - G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } - G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } - G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } - G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } + -- Mini Statusline. + local LC = require('lualine.themes.nordic') + G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } + G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } + G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } + G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } + G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } + G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } + G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } + G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } - -- Tree Groups - G.TreeNormal = { fg = C.fg, bg = C.bg } - G.TreeNormalNC = { fg = C.fg, bg = C.bg } - G.TreeRootFolder = { fg = C.gray4 } - G.TreeRootName = { fg = C.white2 } - G.TreeFileIcon = { fg = C.blue2 } - G.TreeFileNameOpened = { fg = C.fg } - G.TreeSpecialFile = { fg = C.magenta.bright } - G.TreeGitConflict = { fg = C.magenta.bright } - G.TreeGitModified = { fg = C.git.change } - G.TreeGitDirty = { fg = C.gray4 } - G.TreeGitAdded = { fg = C.git.add } - G.TreeGitNew = { fg = C.gray4 } - G.TreeGitDeleted = { fg = C.gray4 } - G.TreeGitStaged = { fg = C.gray4 } - G.TreeGitUntracked = { fg = C.orange.base } - G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } - G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } - G.TreeCursorLine = { bg = C.gray1 } - G.TreeCursor = { bg = C.none, fg = C.none } - G.TreeFolderIcon = { fg = C.yellow.dim } - G.TreeIndentMarker = { fg = C.gray4 } - G.TreeSymlink = { fg = C.blue2 } - G.TreeFolderName = { fg = C.blue1 } - G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg } + -- Tree Groups + G.TreeNormal = { fg = C.fg, bg = C.bg } + G.TreeNormalNC = { fg = C.fg, bg = C.bg } + G.TreeRootFolder = { fg = C.gray4 } + G.TreeRootName = { fg = C.white2 } + G.TreeFileIcon = { fg = C.blue2 } + G.TreeFileNameOpened = { fg = C.fg } + G.TreeSpecialFile = { fg = C.magenta.bright } + G.TreeGitConflict = { fg = C.magenta.bright } + G.TreeGitModified = { fg = C.git.change } + G.TreeGitDirty = { fg = C.gray4 } + G.TreeGitAdded = { fg = C.git.add } + G.TreeGitNew = { fg = C.gray4 } + G.TreeGitDeleted = { fg = C.gray4 } + G.TreeGitStaged = { fg = C.gray4 } + G.TreeGitUntracked = { fg = C.orange.base } + G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } + G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } + G.TreeCursorLine = { bg = C.bg_selected } + G.TreeCursor = { bg = C.none, fg = C.none } + G.TreeFolderIcon = { fg = C.yellow.dim } + G.TreeIndentMarker = { fg = C.gray4 } + G.TreeSymlink = { fg = C.blue2 } + G.TreeFolderName = { fg = C.blue1 } + G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg } - -- Nvim tree. - G.NvimTreeNormal = { link = 'TreeNormal' } - G.NvimTreeNormalNC = { link = 'TreeNormalNC' } - G.NvimTreeFolderName = { link = 'TreeFolderName'} - G.NvimTreeOpenedFolderName = { link = 'TreeFolderName' } - G.NvimTreeEmptyFolderName = { link = 'TreeFolderName' } - G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' } - G.NvimTreeFileIcon = { link = 'TreeFileIcon' } - G.NvimTreeFileNameOpened = { link = 'TreeFileNameOpened' } - G.NvimTreeSpecialFile = { link = 'TreeSpecialFile' } - G.NvimTreeRootFolder = { link = 'TreeRootFolder' } - G.NvimTreeGitDirty = { link = 'TreeGitDirty' } - G.NvimTreeGitAdded = { link = 'TreeGitAdded' } - G.NvimTreeGitNew = { link = 'TreeGitNew' } - G.NvimTreeGitDeleted = { link = 'TreeGitDeleted' } - G.NvimTreeGitStaged = { link = 'TreeGitStaged' } - G.NvimTreeGitConflict = { link = 'TreeGitConflict' } - G.NvimTreeGitModified = { link = 'TreeGitModified' } - G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' } - G.NvimTreeWinSeparator = { link = 'TreeWinSeparator' } - G.NvimTreeCursorLine = { link = 'TreeCursorLine' } - G.NvimTreeCursor = { link = 'TreeCursor' } - G.NvimTreeSymlink = { link = 'TreeSymlink' } + -- Nvim tree. + G.NvimTreeNormal = { link = 'TreeNormal' } + G.NvimTreeNormalNC = { link = 'TreeNormalNC' } + G.NvimTreeFolderName = { link = 'TreeFolderName' } + G.NvimTreeOpenedFolderName = { link = 'TreeFolderName' } + G.NvimTreeEmptyFolderName = { link = 'TreeFolderName' } + G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' } + G.NvimTreeFileIcon = { link = 'TreeFileIcon' } + G.NvimTreeFileNameOpened = { link = 'TreeFileNameOpened' } + G.NvimTreeSpecialFile = { link = 'TreeSpecialFile' } + G.NvimTreeRootFolder = { link = 'TreeRootFolder' } + G.NvimTreeGitDirty = { link = 'TreeGitDirty' } + G.NvimTreeGitAdded = { link = 'TreeGitAdded' } + G.NvimTreeGitNew = { link = 'TreeGitNew' } + G.NvimTreeGitDeleted = { link = 'TreeGitDeleted' } + G.NvimTreeGitStaged = { link = 'TreeGitStaged' } + G.NvimTreeGitConflict = { link = 'TreeGitConflict' } + G.NvimTreeGitModified = { link = 'TreeGitModified' } + G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' } + G.NvimTreeWinSeparator = { link = 'TreeWinSeparator' } + G.NvimTreeCursorLine = { link = 'TreeCursorLine' } + G.NvimTreeCursor = { link = 'TreeCursor' } + G.NvimTreeSymlink = { link = 'TreeSymlink' } - -- Neo tree. - G.NeoTreeCursorLine = { link = 'TreeCursorLine' } - G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' } - G.NeoTreeRootName = { link = 'TreeRootName' } - G.NeoTreeRootFolder = { link = 'TreeRootFolder' } - G.NeoTreeFileIcon = { link = 'TreeFileIcon' } - G.NeoTreeFileNameOpened = { link = 'TreeFileNameOpened'} - G.NeoTreeFolderName = { link = 'TreeFolderName' } - G.NeoTreeOpenedFolderName = { link = 'TreeFolderName' } - G.NeoTreeEmptyFolderName = { link = 'TreeFolderName' } - G.NeoTreeSpecialFile = { link = 'TreeSpecialFile' } - G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' } - G.NeoTreeGitAdded = { link = 'TreeGitAdded' } - G.NeoTreeGitNew = { link = 'TreeGitNew' } - G.NeoTreeGitDirty = { link = 'TreeGitDirty' } - G.NeoTreeGitDeleted = { link = 'TreeGitDeleted' } - G.NeoTreeGitStaged = { link = 'TreeGitStaged' } - G.NeoTreeGitConflict = { link = 'TreeGitConflict'} - G.NeoTreeGitModified = { link = 'TreeGitModified' } - G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' } - G.NeoTreeWinSeparator = { link = 'TreeWinSeparator' } - G.NeoTreeCursor = { link = 'TreeCursor' } - G.NeoTreeNormal = { link = 'TreeNormal' } - G.NeoTreeNormalNC = { link = 'TreeNormalNC' } - G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' } - G.NeoTreeTitleBar = { link = 'TreeTitleBar' } - G.NeoTreeFloatBorder = { link = 'TreeFloatBorder' } + -- Neo tree. + G.NeoTreeCursorLine = { link = 'TreeCursorLine' } + G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' } + G.NeoTreeRootName = { link = 'TreeRootName' } + G.NeoTreeRootFolder = { link = 'TreeRootFolder' } + G.NeoTreeFileIcon = { link = 'TreeFileIcon' } + G.NeoTreeFileNameOpened = { link = 'TreeFileNameOpened' } + G.NeoTreeFolderName = { link = 'TreeFolderName' } + G.NeoTreeOpenedFolderName = { link = 'TreeFolderName' } + G.NeoTreeEmptyFolderName = { link = 'TreeFolderName' } + G.NeoTreeSpecialFile = { link = 'TreeSpecialFile' } + G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' } + G.NeoTreeGitAdded = { link = 'TreeGitAdded' } + G.NeoTreeGitNew = { link = 'TreeGitNew' } + G.NeoTreeGitDirty = { link = 'TreeGitDirty' } + G.NeoTreeGitDeleted = { link = 'TreeGitDeleted' } + G.NeoTreeGitStaged = { link = 'TreeGitStaged' } + G.NeoTreeGitConflict = { link = 'TreeGitConflict' } + G.NeoTreeGitModified = { link = 'TreeGitModified' } + G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' } + G.NeoTreeWinSeparator = { link = 'TreeWinSeparator' } + G.NeoTreeCursor = { link = 'TreeCursor' } + G.NeoTreeNormal = { link = 'TreeNormal' } + G.NeoTreeNormalNC = { link = 'TreeNormalNC' } + G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' } + G.NeoTreeTitleBar = { link = 'TreeTitleBar' } + G.NeoTreeFloatBorder = { link = 'TreeFloatBorder' } - -- Noice Flat. - G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } - G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } - G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } - G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } - G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } - G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } - G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } - G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } - G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } - G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopup = { bg = C.bg_float } + -- Noice Flat. + G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } + G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } + G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } + G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } + G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } + G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } + G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } + G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } + G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } + G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopup = { bg = C.bg_float } - -- Noice Classic. - if O.noice.style == 'classic' then - G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlinePopup = { bg = C.bg } - G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } - end + -- Noice Classic. + if O.noice.style == 'classic' then + G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlinePopup = { bg = C.bg } + G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } + end - -- Nvim cmp. - G.CmpItemAbbrDeprecated = { fg = C.grey4 } - G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } - G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } - G.CmpItemKindField = { link = '@field' } - G.CmpItemKindProperty = { link = '@property' } - G.CmpItemKindEvent = { link = 'Type' } - G.CmpItemKindText = { fg = C.grey4 } - G.CmpItemKindEnum = { link = 'Type' } - G.CmpItemKindKeyword = { link = 'Keyword' } - G.CmpItemKindConstant = { link = 'Constant' } - G.CmpItemKindConstructor = { link = 'Function' } - G.CmpItemKindReference = { fg = C.cyan.base } - G.CmpItemKindFunction = { link = 'Function' } - G.CmpItemKindStruct = { link = 'Type' } - G.CmpItemKindClass = { link = 'Type' } - G.CmpItemKindModule = { fg = C.yellow.dim } - G.CmpItemKindOperator = { link = 'Operator' } - G.CmpItemKindVariable = { fg = C.cyan.base } - G.CmpItemKindFile = { fg = C.blue1 } - G.CmpItemKindUnit = { link = 'Constant' } - G.CmpItemKindSnippet = { fg = C.blue1 } - G.CmpItemKindFolder = { fg = C.yellow.dark } - G.CmpItemKindMethod = { link = 'Function' } - G.CmpItemKindValue = { link = 'Constant' } - G.CmpItemKindEnumMember = { link = 'Type' } - G.CmpItemKindInterface = { link = 'Type' } - G.CmpItemKindColor = { link = 'Constant' } - G.CmpItemKindTypeParameter = { link = 'Type' } - G.CmpItemKindTabNine = { fg = C.red.base } - G.CmpItemKindCopilot = { fg = C.red.base } + -- Nvim cmp. + G.CmpItemAbbrDeprecated = { fg = C.grey4 } + G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } + G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } + G.CmpItemKindField = { link = '@field' } + G.CmpItemKindProperty = { link = '@property' } + G.CmpItemKindEvent = { link = 'Type' } + G.CmpItemKindText = { fg = C.grey4 } + G.CmpItemKindEnum = { link = 'Type' } + G.CmpItemKindKeyword = { link = 'Keyword' } + G.CmpItemKindConstant = { link = 'Constant' } + G.CmpItemKindConstructor = { link = 'Function' } + G.CmpItemKindReference = { fg = C.cyan.base } + G.CmpItemKindFunction = { link = 'Function' } + G.CmpItemKindStruct = { link = 'Type' } + G.CmpItemKindClass = { link = 'Type' } + G.CmpItemKindModule = { fg = C.yellow.dim } + G.CmpItemKindOperator = { link = 'Operator' } + G.CmpItemKindVariable = { fg = C.cyan.base } + G.CmpItemKindFile = { fg = C.blue1 } + G.CmpItemKindUnit = { link = 'Constant' } + G.CmpItemKindSnippet = { fg = C.blue1 } + G.CmpItemKindFolder = { fg = C.yellow.dark } + G.CmpItemKindMethod = { link = 'Function' } + G.CmpItemKindValue = { link = 'Constant' } + G.CmpItemKindEnumMember = { link = 'Type' } + G.CmpItemKindInterface = { link = 'Type' } + G.CmpItemKindColor = { link = 'Constant' } + G.CmpItemKindTypeParameter = { link = 'Type' } + G.CmpItemKindTabNine = { fg = C.red.base } + G.CmpItemKindCopilot = { fg = C.red.base } - -- Nvim DAP. - G.DapBreakPoint = { fg = C.red.bright } + -- Nvim DAP. + G.DapBreakPoint = { fg = C.red.bright } - -- Nvim DAP UI. - G.DapUINormal = { bg = C.bg_float } - G.DapUIStop = { fg = C.red.bright, bold = true } - G.DapUIRestart = { fg = C.green.bright, bold = true } - G.DapUIPlayPause = { fg = C.green.bright, bold = true } - G.DapUIStepInto = { fg = C.blue2, bold = true } - G.DapUIStepOver = { fg = C.blue2, bold = true } - G.DapUIStepOut = { fg = C.blue2, bold = true } - G.DapUIStepBack = { fg = C.blue3, bold = true } - G.DapUIValue = { fg = C.magenta.bright } - G.DapUIWatchesValue = { fg = C.green.bright } - G.DapUIType = { fg = C.yellow.base } - G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } - G.DapUIFloatNormal = { bg = C.bg } - G.DapUILineNumber = { fg = C.green.bright } + -- Nvim DAP UI. + G.DapUINormal = { bg = C.bg_float } + G.DapUIStop = { fg = C.red.bright, bold = true } + G.DapUIRestart = { fg = C.green.bright, bold = true } + G.DapUIPlayPause = { fg = C.green.bright, bold = true } + G.DapUIStepInto = { fg = C.blue2, bold = true } + G.DapUIStepOver = { fg = C.blue2, bold = true } + G.DapUIStepOut = { fg = C.blue2, bold = true } + G.DapUIStepBack = { fg = C.blue3, bold = true } + G.DapUIValue = { fg = C.magenta.bright } + G.DapUIWatchesValue = { fg = C.green.bright } + G.DapUIType = { fg = C.yellow.base } + G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } + G.DapUIFloatNormal = { bg = C.bg } + G.DapUILineNumber = { fg = C.green.bright } - -- Notify. - G.NotifyBackground = { bg = C.bg_float } - G.NotifyERRORBorder = { fg = C.error } - G.NotifyERRORIcon = { fg = C.error } - G.NotifyERRORTitle = { fg = C.error, bold = true } - G.NotifyERRORBody = { fg = C.fg } - G.NotifyWARNBorder = { fg = C.warn } - G.NotifyWARNIcon = { fg = C.warn } - G.NotifyWARNTitle = { fg = C.warn, bold = true } - G.NotifyWARNBody = { fg = C.fg } - G.NotifyINFOBorder = { fg = C.info } - G.NotifyINFOIcon = { fg = C.info } - G.NotifyINFOTitle = { fg = C.info, bold = true } - G.NotifyINFOBody = { fg = C.fg } - G.NotifyDEBUGBorder = { fg = C.orange.bright } - G.NotifyDEBUGIcon = { fg = C.orange.bright } - G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } - G.NotifyDEBUGBody = { fg = C.fg } - G.NotifyTRACEBorder = { fg = C.gray5 } - G.NotifyTRACEIcon = { fg = C.gray5 } - G.NotifyTRACETitle = { fg = C.gray5, bold = true } - G.NotifyTRACEBody = { fg = C.fg } + -- Notify. + G.NotifyBackground = { bg = C.bg_float } + G.NotifyERRORBorder = { fg = C.error } + G.NotifyERRORIcon = { fg = C.error } + G.NotifyERRORTitle = { fg = C.error, bold = true } + G.NotifyERRORBody = { fg = C.fg } + G.NotifyWARNBorder = { fg = C.warn } + G.NotifyWARNIcon = { fg = C.warn } + G.NotifyWARNTitle = { fg = C.warn, bold = true } + G.NotifyWARNBody = { fg = C.fg } + G.NotifyINFOBorder = { fg = C.info } + G.NotifyINFOIcon = { fg = C.info } + G.NotifyINFOTitle = { fg = C.info, bold = true } + G.NotifyINFOBody = { fg = C.fg } + G.NotifyDEBUGBorder = { fg = C.orange.bright } + G.NotifyDEBUGIcon = { fg = C.orange.bright } + G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } + G.NotifyDEBUGBody = { fg = C.fg } + G.NotifyTRACEBorder = { fg = C.gray5 } + G.NotifyTRACEIcon = { fg = C.gray5 } + G.NotifyTRACETitle = { fg = C.gray5, bold = true } + G.NotifyTRACEBody = { fg = C.fg } - -- Telescope Classic. - G.TelescopeNormal = { bg = C.bg } - G.TelescopePromptNormal = { bg = C.bg } - G.TelescopeResultsNormal = { bg = C.bg } - G.TelescopePreviewNormal = { bg = C.bg } - G.TelescopePreviewLine = { bg = C.gray2 } - G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeBorder = { fg = C.white0, bg = C.bg } - G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } - G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } - G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } - G.TelescopeMatching = { bold = true } - G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopeMultiSelection = { bg = C.bg } + -- Telescope Classic. + G.TelescopeNormal = { bg = C.bg } + G.TelescopePromptNormal = { bg = C.bg } + G.TelescopeResultsNormal = { bg = C.bg } + G.TelescopePreviewNormal = { bg = C.bg } + G.TelescopePreviewLine = { bg = C.gray2 } + G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeBorder = { fg = C.white0, bg = C.bg } + G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } + G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } + G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } + G.TelescopeMatching = { bold = true } + G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopeMultiSelection = { bg = C.bg } - -- Telescope Flat. - if O.telescope.style == 'flat' then - G.TelescopeNormal = { bg = C.bg_float } - G.TelescopePromptNormal = { bg = C.black2 } - G.TelescopeResultsNormal = { bg = C.bg_float } - G.TelescopePreviewNormal = { bg = C.bg_float } - G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } - G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeBorder = { fg = C.black0, bg = C.black0 } - G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } - G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopeMultiSelection = { bg = C.bg_float } - G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } - G.TelescopePreviewLine = { bg = C.gray1 } - end + -- Telescope Flat. + if O.telescope.style == 'flat' then + G.TelescopeNormal = { bg = C.bg_float } + G.TelescopePromptNormal = { bg = C.black2 } + G.TelescopeResultsNormal = { bg = C.bg_float } + G.TelescopePreviewNormal = { bg = C.bg_float } + G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } + G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeBorder = { fg = C.black0, bg = C.black0 } + G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } + G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopeMultiSelection = { bg = C.bg_float } + G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } + G.TelescopePreviewLine = { bg = C.gray1 } + end - -- Treesitter. - -- LSP Semantic Token Groups - -- Types follow the pattern @lsp.type.. - -- These groups are for the Neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - --- Misc - G['@comment'] = { link = 'Comment' } - --G['@comment.documentation'] = { link = 'Comment' } - G['@comment.documentation'] = { link = 'Comment' } - G['@comment.note'] = { fg = C.hint } - G['@comment.error'] = { fg = C.error } - G['@comment.hint'] = { fg = C.hint } - G['@comment.info'] = { fg = C.info } - G['@comment.warning'] = { fg = C.warning } - G['@comment.todo'] = { fg = C.todo } - G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. - --- Punctuation - G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` - G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. - G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. - G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } - --- Literals - G['@string'] = { link = 'String' } - G['@string.documentation'] = { link = 'String' } - G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. - G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. - --- Functions - G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. - G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] - --- Keywords - G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. - G['@keyword.conditional'] = { link = 'Conditional' } - G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. - G['@keyword.debug'] = { link = 'Debug' } - G['@keyword.directive'] = { link = 'PreProc' } - G['@keyword.directive.define'] = { link = 'Define' } - G['@keyword.exception'] = { link = 'Exception' } - G['@keyword.export'] = { link = 'Keyword' } - G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. - G['@keyword.import'] = { link = 'Include' } - G['@keyword.operator'] = { link = 'Keyword' } - G['@keyword.repeat'] = { link = 'Repeat' } - G['@keyword.return'] = { link = 'Keyword' } - G['@keyword.storage'] = { link = 'StorageClass' } - G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. - --- Types - G['@type.builtin'] = { link = 'Type' } - G['@field'] = { link = 'Field' } -- For fields. - G['@property'] = { link = 'Field' } - --- Identifiers - G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. - G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. - G['@variable.member'] = { link = 'Field' } - --- Text - -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text - -- G["@text.literal.markdown"] = { } - G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. - G['@text.strong'] = { bold = true } - G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. - G['@text.underline'] = { underline = true } -- For text to be represented with an underline. - G['@text.strike'] = { strikethrough = true } -- For strikethrough text. - G['@text.title'] = { link = 'Title' } -- Text that is part of a title. - G['@text.uri'] = { underline = true } -- Any URI like a link or email. - G['@text.literal'] = { link = 'String' } - G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@text.reference'] = { link = 'Link' } - G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. - G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. - G['@text.warning'] = { fg = C.warning } - G['@text.danger'] = { fg = C.error } - G['@text.diff.add'] = { link = 'DiffAdd' } - G['@text.diff.delete'] = { link = 'DiffDelete' } - G['@text.todo'] = { link = 'Todo' } - G['@text.note'] = { link = 'Note' } - --- Markup - G['@markup'] = { link = '@none' } - G['@markup.emphasis'] = { italic = true } - G['@markup.environment'] = { link = 'Macro' } - G['@markup.environment.name'] = { link = 'Type' } - G['@markup.heading'] = { link = 'Title' } - G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } - G['@markup.heading.2'] = { fg = C.orange.base, bold = true } - G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } - G['@markup.heading.4'] = { fg = C.green.base } - G['@markup.heading.5'] = { fg = C.blue2, italic = true } - G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } - G['@markup.italic'] = { italic = true } - G['@markup.list'] = { link = '@operator' } - G['@markup.list.checked'] = { link = 'Field' } - G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } - G['@markup.list.unchecked'] = { fg = C.fg } - G['@markup.link'] = { fg = C.cyan.base } - G['@markup.link.label'] = { link = 'SpecialChar' } - G['@markup.link.label.symbol'] = { link = 'Identifier' } - G['@markup.link.url'] = { link = 'Underlined' } - G['@markup.math'] = { link = 'Special' } - G['@markup.raw'] = { link = 'String' } - G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@markup.strong'] = { bold = true } - G['@markup.strikethrough'] = { strikethrough = true } - G['@markup.underline'] = { underline = true } - -- TSX - G['@tag.tsx'] = { fg = C.blue1 } - G['@constructor.tsx'] = { fg = C.blue1 } - G['@tag.delimiter.tsx'] = { fg = C.blue1 } - --LSP Semantic Token Groups - G['@lsp.type.boolean'] = { link = 'Boolean' } - G['@lsp.type.builtinType'] = { link = 'Type' } - G['@lsp.type.comment'] = { link = 'Comment' } - G['@lsp.type.enum'] = { link = 'Type' } - G['@lsp.type.enumMember'] = { link = 'Field' } - G['@lsp.type.escapeSequence'] = { link = '@string.escape' } - G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } - G['@lsp.type.interface'] = { link = 'Keyword' } - G['@lsp.type.keyword'] = { link = 'Keyword' } - G['@lsp.type.namespace'] = { link = 'Namespace' } - G['@lsp.type.number'] = { link = 'Number' } - G['@lsp.type.operator'] = { link = '@operator' } - G['@lsp.type.parameter'] = { link = '@parameter' } - G['@lsp.type.property'] = { link = '@property' } - G['@lsp.type.selfKeyword'] = { link = 'Builtin' } - G['@lsp.type.string.rust'] = { link = 'String' } - G['@lsp.type.typeAlias'] = { link = 'Type' } - G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } - G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables - G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } - G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.keyword.async'] = { link = 'Macro' } - G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } - G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.operator.injected'] = { link = 'Operator' } - G['@lsp.typemod.string.injected'] = { link = 'String' } - G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } - G['@lsp.typemod.variable.injected'] = { link = 'Variable' } - G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } - -- Things that seems to be missing? - G['@annotation'] = { link = 'PreProc' } - G['@diff.plus'] = { link = 'DiffAdd' } - G['@diff.minus'] = { link = 'DiffDelete' } - G['@diff.delta'] = { link = 'DiffChange' } - G['@character'] = { link = 'Character' } - G['@character.special'] = { link = 'SpecialChar' } - G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. - G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. - G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` - G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` - G['@constant'] = { link = 'Constant' } - G['@number'] = { link = 'Constant' } - G['@float'] = { link = 'Constant' } - G['@boolean'] = { link = 'Constant' } - G['@constant.macro'] = { link = 'Constant' } - G['@constant.builtin'] = { link = 'Constant' } - G['@repeat'] = { link = 'Keyword' } - G['@conditional'] = { link = 'Keyword' } - G['@class'] = { link = 'Keyword' } - G['@include'] = { link = 'Include' } - G['@macro'] = { link = 'Macro' } - G['@module'] = { fg = C.yellow.base } - G['@module.builtin'] = { link = 'Builtin' } - G['@preproc'] = { link = 'Macro' } - G['@attribute'] = { link = 'Macro' } - G['@function.macro'] = { link = 'Macro' } - G['@define'] = { link = 'Macro' } - G['@exception'] = { link = 'Macro' } - G['@function'] = { link = 'Function' } - G['@method'] = { link = 'Function' } - G['@method.call'] = { link = 'Function' } - G['@function.call'] = { link = 'Function' } - G['@function.builtin'] = { link = 'Function' } - G['@property.cpp'] = { fg = C.cyan.base } - G['@namespace'] = { fg = C.yellow.dim } - G['@type'] = { link = 'Type' } - G['@type.definition'] = { link = 'Type' } - G['@type.qualifier'] = { link = 'Keyword' } - G['@storageclass'] = { link = 'Keyword' } - G['@none'] = { link = 'None' } + -- Treesitter. + -- LSP Semantic Token Groups + -- Types follow the pattern @lsp.type.. + -- These groups are for the Neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + --- Misc + G['@comment'] = { link = 'Comment' } + --G['@comment.documentation'] = { link = 'Comment' } + G['@comment.documentation'] = { link = 'Comment' } + G['@comment.note'] = { fg = C.hint } + G['@comment.error'] = { fg = C.error } + G['@comment.hint'] = { fg = C.hint } + G['@comment.info'] = { fg = C.info } + G['@comment.warning'] = { fg = C.warning } + G['@comment.todo'] = { fg = C.todo } + G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. + --- Punctuation + G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` + G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. + G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. + G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } + --- Literals + G['@string'] = { link = 'String' } + G['@string.documentation'] = { link = 'String' } + G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. + G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. + --- Functions + G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. + G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] + --- Keywords + G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. + G['@keyword.conditional'] = { link = 'Conditional' } + G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. + G['@keyword.debug'] = { link = 'Debug' } + G['@keyword.directive'] = { link = 'PreProc' } + G['@keyword.directive.define'] = { link = 'Define' } + G['@keyword.exception'] = { link = 'Exception' } + G['@keyword.export'] = { link = 'Keyword' } + G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. + G['@keyword.import'] = { link = 'Include' } + G['@keyword.operator'] = { link = 'Keyword' } + G['@keyword.repeat'] = { link = 'Repeat' } + G['@keyword.return'] = { link = 'Keyword' } + G['@keyword.storage'] = { link = 'StorageClass' } + G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. + --- Types + G['@type.builtin'] = { link = 'Type' } + G['@field'] = { link = 'Field' } -- For fields. + G['@property'] = { link = 'Field' } + --- Identifiers + G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. + G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. + G['@variable.member'] = { link = 'Field' } + --- Text + -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text + -- G["@text.literal.markdown"] = { } + G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. + G['@text.strong'] = { bold = true } + G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. + G['@text.underline'] = { underline = true } -- For text to be represented with an underline. + G['@text.strike'] = { strikethrough = true } -- For strikethrough text. + G['@text.title'] = { link = 'Title' } -- Text that is part of a title. + G['@text.uri'] = { underline = true } -- Any URI like a link or email. + G['@text.literal'] = { link = 'String' } + G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@text.reference'] = { link = 'Link' } + G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. + G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. + G['@text.warning'] = { fg = C.warning } + G['@text.danger'] = { fg = C.error } + G['@text.diff.add'] = { link = 'DiffAdd' } + G['@text.diff.delete'] = { link = 'DiffDelete' } + G['@text.todo'] = { link = 'Todo' } + G['@text.note'] = { link = 'Note' } + --- Markup + G['@markup'] = { link = '@none' } + G['@markup.emphasis'] = { italic = true } + G['@markup.environment'] = { link = 'Macro' } + G['@markup.environment.name'] = { link = 'Type' } + G['@markup.heading'] = { link = 'Title' } + G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } + G['@markup.heading.2'] = { fg = C.orange.base, bold = true } + G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } + G['@markup.heading.4'] = { fg = C.green.base } + G['@markup.heading.5'] = { fg = C.blue2, italic = true } + G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } + G['@markup.italic'] = { italic = true } + G['@markup.list'] = { link = '@operator' } + G['@markup.list.checked'] = { link = 'Field' } + G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } + G['@markup.list.unchecked'] = { fg = C.fg } + G['@markup.link'] = { fg = C.cyan.base } + G['@markup.link.label'] = { link = 'SpecialChar' } + G['@markup.link.label.symbol'] = { link = 'Identifier' } + G['@markup.link.url'] = { link = 'Underlined' } + G['@markup.math'] = { link = 'Special' } + G['@markup.raw'] = { link = 'String' } + G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@markup.strong'] = { bold = true } + G['@markup.strikethrough'] = { strikethrough = true } + G['@markup.underline'] = { underline = true } + -- TSX + G['@tag.tsx'] = { fg = C.blue1 } + G['@constructor.tsx'] = { fg = C.blue1 } + G['@tag.delimiter.tsx'] = { fg = C.blue1 } + --LSP Semantic Token Groups + G['@lsp.type.boolean'] = { link = 'Boolean' } + G['@lsp.type.builtinType'] = { link = 'Type' } + G['@lsp.type.comment'] = { link = 'Comment' } + G['@lsp.type.enum'] = { link = 'Type' } + G['@lsp.type.enumMember'] = { link = 'Field' } + G['@lsp.type.escapeSequence'] = { link = '@string.escape' } + G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } + G['@lsp.type.interface'] = { link = 'Keyword' } + G['@lsp.type.keyword'] = { link = 'Keyword' } + G['@lsp.type.namespace'] = { link = 'Namespace' } + G['@lsp.type.number'] = { link = 'Number' } + G['@lsp.type.operator'] = { link = '@operator' } + G['@lsp.type.parameter'] = { link = '@parameter' } + G['@lsp.type.property'] = { link = '@property' } + G['@lsp.type.selfKeyword'] = { link = 'Builtin' } + G['@lsp.type.string.rust'] = { link = 'String' } + G['@lsp.type.typeAlias'] = { link = 'Type' } + G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } + G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables + G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } + G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.keyword.async'] = { link = 'Macro' } + G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } + G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.operator.injected'] = { link = 'Operator' } + G['@lsp.typemod.string.injected'] = { link = 'String' } + G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } + G['@lsp.typemod.variable.injected'] = { link = 'Variable' } + G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } + -- Things that seems to be missing? + G['@annotation'] = { link = 'PreProc' } + G['@diff.plus'] = { link = 'DiffAdd' } + G['@diff.minus'] = { link = 'DiffDelete' } + G['@diff.delta'] = { link = 'DiffChange' } + G['@character'] = { link = 'Character' } + G['@character.special'] = { link = 'SpecialChar' } + G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. + G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. + G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` + G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` + G['@constant'] = { link = 'Constant' } + G['@number'] = { link = 'Constant' } + G['@float'] = { link = 'Constant' } + G['@boolean'] = { link = 'Constant' } + G['@constant.macro'] = { link = 'Constant' } + G['@constant.builtin'] = { link = 'Constant' } + G['@repeat'] = { link = 'Keyword' } + G['@conditional'] = { link = 'Keyword' } + G['@class'] = { link = 'Keyword' } + G['@include'] = { link = 'Include' } + G['@macro'] = { link = 'Macro' } + G['@module'] = { fg = C.yellow.base } + G['@module.builtin'] = { link = 'Builtin' } + G['@preproc'] = { link = 'Macro' } + G['@attribute'] = { link = 'Macro' } + G['@function.macro'] = { link = 'Macro' } + G['@define'] = { link = 'Macro' } + G['@exception'] = { link = 'Macro' } + G['@function'] = { link = 'Function' } + G['@method'] = { link = 'Function' } + G['@method.call'] = { link = 'Function' } + G['@function.call'] = { link = 'Function' } + G['@function.builtin'] = { link = 'Function' } + G['@property.cpp'] = { fg = C.cyan.base } + G['@namespace'] = { fg = C.yellow.dim } + G['@type'] = { link = 'Type' } + G['@type.definition'] = { link = 'Type' } + G['@type.qualifier'] = { link = 'Keyword' } + G['@storageclass'] = { link = 'Keyword' } + G['@none'] = { link = 'None' } - -- Treesitter context. - local bg - local fg - if O.ts_context.dark_background then - bg = C.black1 - fg = C.gray1 - else - bg = C.gray1 - fg = C.gray4 - end - G.TreesitterContext = { bg = bg } - G.TreesitterContextLineNumber = { fg = fg, bg = bg } + -- Treesitter context. + local bg + local fg + if O.ts_context.dark_background then + bg = C.black1 + fg = C.gray1 + else + bg = C.gray1 + fg = C.gray4 + end + G.TreesitterContext = { bg = bg } + G.TreesitterContextLineNumber = { fg = fg, bg = bg } - -- Neorg - G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } - G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } - G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } - G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } - G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } - G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } - G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } - G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } - G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } - G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } - G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } - G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } + -- Neorg + G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } + G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } + G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } + G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } + G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } + G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } + G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } + G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } + G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } + G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } + G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } + G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } - -- Trouble. - G.TroubleNormal = { bg = C.bg_float } - G.TroubleText = { fg = C.fg } - G.TroubleCount = { fg = C.white1, bg = C.gray2 } - G.TroubleIndent = { fg = C.gray1 } - G.TroubleFile = { fg = C.cyan.bright } - G.TroubleFoldIcon = { fg = C.gray1 } + -- Trouble. + G.TroubleNormal = { bg = C.bg_float } + G.TroubleText = { fg = C.fg } + G.TroubleCount = { fg = C.white1, bg = C.gray2 } + G.TroubleIndent = { fg = C.gray1 } + G.TroubleFile = { fg = C.cyan.bright } + G.TroubleFoldIcon = { fg = C.gray1 } - -- Vimtex. - G.texGroup = { fg = C.fg } - G.texEnvArgName = { fg = C.cyan.base } - G.texMathEnvArgName = { link = 'texEnvArgName' } - G.texArg = { fg = C.cyan.base } - G.texStyleItal = { fg = C.fg, italic = true } - G.texPartArgTitle = { fg = C.cyan.base } - G.texDelim = { fg = C.fg } - G.texMathGroup = { fg = C.fg } - G.texMathArg = { fg = C.fg } - G.texMathZoneEnv = { fg = C.fg } - G.texMathZoneTI = { fg = C.fg } - G.texMathDelim = { fg = C.fg } - G.texMathDelimZoneTI = { fg = C.blue2 } - G.texMathSuper = { fg = C.fg } - G.texFileArg = { fg = C.green.base } - G.texRefArg = { fg = C.magenta.bright } - G.texGroupError = { link = 'DiagnosticError' } - G.texMathSub = { fg = C.fg } - G.texCmdEnv = { fg = C.blue2 } - G.texSpecialChar = { fg = C.orange.base } - G.texLigature = { fg = C.fg } - G.texFileOpt = { fg = C.fg } - G.texVerbZone = { link = 'String' } - G.texLstZone = { link = 'String' } + -- Vimtex. + G.texGroup = { fg = C.fg } + G.texEnvArgName = { fg = C.cyan.base } + G.texMathEnvArgName = { link = 'texEnvArgName' } + G.texArg = { fg = C.cyan.base } + G.texStyleItal = { fg = C.fg, italic = true } + G.texPartArgTitle = { fg = C.cyan.base } + G.texDelim = { fg = C.fg } + G.texMathGroup = { fg = C.fg } + G.texMathArg = { fg = C.fg } + G.texMathZoneEnv = { fg = C.fg } + G.texMathZoneTI = { fg = C.fg } + G.texMathDelim = { fg = C.fg } + G.texMathDelimZoneTI = { fg = C.blue2 } + G.texMathSuper = { fg = C.fg } + G.texFileArg = { fg = C.green.base } + G.texRefArg = { fg = C.magenta.bright } + G.texGroupError = { link = 'DiagnosticError' } + G.texMathSub = { fg = C.fg } + G.texCmdEnv = { fg = C.blue2 } + G.texSpecialChar = { fg = C.orange.base } + G.texLigature = { fg = C.fg } + G.texFileOpt = { fg = C.fg } + G.texVerbZone = { link = 'String' } + G.texLstZone = { link = 'String' } - -- Whichkey. - G.WhichKey = { fg = C.yellow.base } - G.WhichKeyFloat = { bg = C.bg_float } - G.WhichKeyDesc = { fg = C.white0 } - G.WhichKeyGroup = { fg = C.orange.bright, bold = true } - G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } - -- TODO: Unsure. - G.WhichKeySeperator = {} - G.WhichKeyValue = {} + -- Whichkey. + G.WhichKey = { fg = C.yellow.base } + G.WhichKeyFloat = { bg = C.bg_float } + G.WhichKeyDesc = { fg = C.white0 } + G.WhichKeyGroup = { fg = C.orange.bright, bold = true } + G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } + -- TODO: Unsure. + G.WhichKeySeperator = {} + G.WhichKeyValue = {} - -- Rainbow delimiters - G.RainbowDelimiterOrange = { fg = C.orange.base } - G.RainbowDelimiterYellow = { fg = C.yellow.bright } - G.RainbowDelimiterBlue = { fg = C.blue2 } - G.RainbowDelimiterRed = { fg = C.red.bright } - G.RainbowDelimiterGreen = { fg = C.green.bright } + -- Rainbow delimiters + G.RainbowDelimiterOrange = { fg = C.orange.base } + G.RainbowDelimiterYellow = { fg = C.yellow.bright } + G.RainbowDelimiterBlue = { fg = C.blue2 } + G.RainbowDelimiterRed = { fg = C.red.bright } + G.RainbowDelimiterGreen = { fg = C.green.bright } - return G + return G end return M From b43606d8d7a1ea29379fc2d79e763dd1c4f7ed1f Mon Sep 17 00:00:00 2001 From: bini-x Date: Sun, 29 Sep 2024 19:19:05 +0200 Subject: [PATCH 11/15] fixed formatting --- lua/nordic/groups/integrations.lua | 1088 ++++++++++++++-------------- 1 file changed, 544 insertions(+), 544 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 9a5af40..849e52a 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -1,579 +1,579 @@ local M = {} function M.get_groups() - local C = require('nordic.colors') - local O = require('nordic.config').options + local C = require('nordic.colors') + local O = require('nordic.config').options - local G = {} + local G = {} - -- Dashboard.lua - G.DashboardHeader = { fg = C.yellow.base, bold = true } - G.DashboardFooter = { fg = C.cyan.base } - G.DashboardCenter = { fg = C.green.base } - G.DashboardShortCut = { fg = C.gray4, bold = true } - G.DashboardProjectTitle = { fg = C.orange.base, bold = true } - G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } - G.DashboardProjectIcon = { fg = C.magenta.bright } - G.DashboardMruTitle = { link = 'DashboardProjectTitle' } - G.DashboardMruIcon = {} - G.DashboardFiles = { fg = C.fg } - G.DashboardDesc = { fg = C.green.base } - G.DashboardKey = { fg = C.red.base, bold = true } - G.DashboardIcon = { fg = C.green.base } + -- Dashboard.lua + G.DashboardHeader = { fg = C.yellow.base, bold = true } + G.DashboardFooter = { fg = C.cyan.base } + G.DashboardCenter = { fg = C.green.base } + G.DashboardShortCut = { fg = C.gray4, bold = true } + G.DashboardProjectTitle = { fg = C.orange.base, bold = true } + G.DashboardProjectTitleIcon = { link = 'DashboardProjectTitle' } + G.DashboardProjectIcon = { fg = C.magenta.bright } + G.DashboardMruTitle = { link = 'DashboardProjectTitle' } + G.DashboardMruIcon = {} + G.DashboardFiles = { fg = C.fg } + G.DashboardDesc = { fg = C.green.base } + G.DashboardKey = { fg = C.red.base, bold = true } + G.DashboardIcon = { fg = C.green.base } - -- Diffview. - G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } - G.DiffviewStatusLine = { bg = C.black0 } - G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } - G.DiffviewFolderSign = { fg = C.yellow.dim } - G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } + -- Diffview. + G.DiffviewNormal = { bg = C.bg_dark, fg = C.fg } + G.DiffviewStatusLine = { bg = C.black0 } + G.DiffviewFilePanelTitle = { fg = C.orange.base, bold = true } + G.DiffviewFolderSign = { fg = C.yellow.dim } + G.DiffviewFolderName = { bg = C.bg_dark, fg = C.blue1 } - -- Gitsigns. - G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } - G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } - G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } - G.GitSignsAddPreview = { link = 'GitSignsAdd' } - G.GitSignsDeletePreview = { link = 'GitSignsDelete' } + -- Gitsigns. + G.GitSignsAdd = { fg = C.git.add, bg = C.bg_sidebar } + G.GitSignsChange = { fg = C.git.change, bg = C.bg_sidebar } + G.GitSignsDelete = { fg = C.git.delete, bg = C.bg_sidebar } + G.GitSignsAddPreview = { link = 'GitSignsAdd' } + G.GitSignsDeletePreview = { link = 'GitSignsDelete' } - -- Indent blankline. - G.IndentBlanklineChar = { fg = C.gray1 } - G.IndentBlanklineContextChar = { fg = C.gray2 } - G.IndentBlanklineContextStart = { sp = C.white0, underline = true } + -- Indent blankline. + G.IndentBlanklineChar = { fg = C.gray1 } + G.IndentBlanklineContextChar = { fg = C.gray2 } + G.IndentBlanklineContextStart = { sp = C.white0, underline = true } - -- Lazy. - G.LazyH1 = { fg = C.yellow.base, bold = true } - G.LazyButtonActive = { link = 'LazyH1' } - G.LazyButton = { fg = C.white0 } - G.LazySpecial = { fg = C.yellow.base } - G.LazyProgressDone = { fg = C.green.bright } - G.LazyProgressTodo = { fg = C.gray4 } - G.LazyCommitType = { fg = C.yellow.base } + -- Lazy. + G.LazyH1 = { fg = C.yellow.base, bold = true } + G.LazyButtonActive = { link = 'LazyH1' } + G.LazyButton = { fg = C.white0 } + G.LazySpecial = { fg = C.yellow.base } + G.LazyProgressDone = { fg = C.green.bright } + G.LazyProgressTodo = { fg = C.gray4 } + G.LazyCommitType = { fg = C.yellow.base } - -- Leap. - G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } - if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end + -- Leap. + G.LeapLabelPrimary = { bg = C.yellow.dim, fg = C.black0, bold = true } + if O.leap.dim_backdrop then G.LeapBackdrop = { fg = C.gray4 } end - -- LSP Signature. - G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } + -- LSP Signature. + G.LspSignatureActiveParameter = { bg = C.bg_float, underline = true, bold = true } - -- LSP Saga. - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } - G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } - G.SagaNormal = { bg = C.black2 } - G.HoverBorder = { link = 'FloatBorder' } - G.HoverNormal = { link = 'NormalFloat' } - G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } - G.RenameBorder = { link = 'FloatBorder' } - G.DiagnosticPos = { fg = C.fg } - G.DiagnosticWord = { fg = C.fg } - G.DiagnosticSource = { fg = C.gray4 } - G.DiagnosticNormal = { link = 'NormalFloat' } - G.DiagnosticShowNormal = { link = 'NormalFloat' } - G.DiagnosticShowBorder = { link = 'FloatBorder' } - G.DiagnosticBorder = { link = 'FloatBorder' } + -- LSP Saga. + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } + G.SagaBorder = { bg = C.black2, fg = C.fg_float_border } + G.SagaNormal = { bg = C.black2 } + G.HoverBorder = { link = 'FloatBorder' } + G.HoverNormal = { link = 'NormalFloat' } + G.RenameNormal = { bg = C.bg_float, fg = C.yellow.bright } + G.RenameBorder = { link = 'FloatBorder' } + G.DiagnosticPos = { fg = C.fg } + G.DiagnosticWord = { fg = C.fg } + G.DiagnosticSource = { fg = C.gray4 } + G.DiagnosticNormal = { link = 'NormalFloat' } + G.DiagnosticShowNormal = { link = 'NormalFloat' } + G.DiagnosticShowBorder = { link = 'FloatBorder' } + G.DiagnosticBorder = { link = 'FloatBorder' } - -- Mini Statusline. - local LC = require('lualine.themes.nordic') - G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } - G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } - G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } - G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } - G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } - G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } - G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } - G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } - G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } + -- Mini Statusline. + local LC = require('lualine.themes.nordic') + G.MiniStatuslineModeNormal = { bg = LC.normal.a.bg, fg = LC.normal.a.fg, bold = LC.normal.a.gui == 'bold' } + G.MiniStatuslineModeInsert = { bg = LC.insert.a.bg, fg = LC.insert.a.fg, bold = LC.insert.a.gui == 'bold' } + G.MiniStatuslineModeVisual = { bg = LC.visual.a.bg, fg = LC.visual.a.fg, bold = LC.visual.a.gui == 'bold' } + G.MiniStatuslineModeReplace = { bg = LC.replace.a.bg, fg = LC.replace.a.fg, bold = LC.replace.a.gui == 'bold' } + G.MiniStatuslineModeCommand = { bg = LC.command.a.bg, fg = LC.command.a.fg, bold = LC.command.a.gui == 'bold' } + G.MiniStatuslineModeOther = { bg = LC.terminal.a.bg, fg = LC.terminal.a.fg, bold = LC.terminal.a.gui == 'bold' } + G.MiniStatuslineDevinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineFilename = { bg = LC.normal.c.bg, fg = LC.normal.c.fg } + G.MiniStatuslineFileinfo = { bg = LC.normal.b.bg, fg = LC.normal.b.fg } + G.MiniStatuslineInactive = { bg = LC.inactive.a.bg, fg = LC.inactive.a.fg, bold = LC.inactive.a.gui == 'bold' } - -- Tree Groups - G.TreeNormal = { fg = C.fg, bg = C.bg } - G.TreeNormalNC = { fg = C.fg, bg = C.bg } - G.TreeRootFolder = { fg = C.gray4 } - G.TreeRootName = { fg = C.white2 } - G.TreeFileIcon = { fg = C.blue2 } - G.TreeFileNameOpened = { fg = C.fg } - G.TreeSpecialFile = { fg = C.magenta.bright } - G.TreeGitConflict = { fg = C.magenta.bright } - G.TreeGitModified = { fg = C.git.change } - G.TreeGitDirty = { fg = C.gray4 } - G.TreeGitAdded = { fg = C.git.add } - G.TreeGitNew = { fg = C.gray4 } - G.TreeGitDeleted = { fg = C.gray4 } - G.TreeGitStaged = { fg = C.gray4 } - G.TreeGitUntracked = { fg = C.orange.base } - G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } - G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } - G.TreeCursorLine = { bg = C.bg_selected } - G.TreeCursor = { bg = C.none, fg = C.none } - G.TreeFolderIcon = { fg = C.yellow.dim } - G.TreeIndentMarker = { fg = C.gray4 } - G.TreeSymlink = { fg = C.blue2 } - G.TreeFolderName = { fg = C.blue1 } - G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg } + -- Tree Groups + G.TreeNormal = { fg = C.fg, bg = C.bg } + G.TreeNormalNC = { fg = C.fg, bg = C.bg } + G.TreeRootFolder = { fg = C.gray4 } + G.TreeRootName = { fg = C.white2 } + G.TreeFileIcon = { fg = C.blue2 } + G.TreeFileNameOpened = { fg = C.fg } + G.TreeSpecialFile = { fg = C.magenta.bright } + G.TreeGitConflict = { fg = C.magenta.bright } + G.TreeGitModified = { fg = C.git.change } + G.TreeGitDirty = { fg = C.gray4 } + G.TreeGitAdded = { fg = C.git.add } + G.TreeGitNew = { fg = C.gray4 } + G.TreeGitDeleted = { fg = C.gray4 } + G.TreeGitStaged = { fg = C.gray4 } + G.TreeGitUntracked = { fg = C.orange.base } + G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } + G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } + G.TreeCursorLine = { bg = C.bg_selected } + G.TreeCursor = { bg = C.none, fg = C.none } + G.TreeFolderIcon = { fg = C.yellow.dim } + G.TreeIndentMarker = { fg = C.gray4 } + G.TreeSymlink = { fg = C.blue2 } + G.TreeFolderName = { fg = C.blue1 } + G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg } - -- Nvim tree. - G.NvimTreeNormal = { link = 'TreeNormal' } - G.NvimTreeNormalNC = { link = 'TreeNormalNC' } - G.NvimTreeFolderName = { link = 'TreeFolderName' } - G.NvimTreeOpenedFolderName = { link = 'TreeFolderName' } - G.NvimTreeEmptyFolderName = { link = 'TreeFolderName' } - G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' } - G.NvimTreeFileIcon = { link = 'TreeFileIcon' } - G.NvimTreeFileNameOpened = { link = 'TreeFileNameOpened' } - G.NvimTreeSpecialFile = { link = 'TreeSpecialFile' } - G.NvimTreeRootFolder = { link = 'TreeRootFolder' } - G.NvimTreeGitDirty = { link = 'TreeGitDirty' } - G.NvimTreeGitAdded = { link = 'TreeGitAdded' } - G.NvimTreeGitNew = { link = 'TreeGitNew' } - G.NvimTreeGitDeleted = { link = 'TreeGitDeleted' } - G.NvimTreeGitStaged = { link = 'TreeGitStaged' } - G.NvimTreeGitConflict = { link = 'TreeGitConflict' } - G.NvimTreeGitModified = { link = 'TreeGitModified' } - G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' } - G.NvimTreeWinSeparator = { link = 'TreeWinSeparator' } - G.NvimTreeCursorLine = { link = 'TreeCursorLine' } - G.NvimTreeCursor = { link = 'TreeCursor' } - G.NvimTreeSymlink = { link = 'TreeSymlink' } + -- Nvim tree. + G.NvimTreeNormal = { link = 'TreeNormal' } + G.NvimTreeNormalNC = { link = 'TreeNormalNC' } + G.NvimTreeFolderName = { link = 'TreeFolderName'} + G.NvimTreeOpenedFolderName = { link = 'TreeFolderName' } + G.NvimTreeEmptyFolderName = { link = 'TreeFolderName' } + G.NvimTreeFolderIcon = { link = 'TreeFolderIcon' } + G.NvimTreeFileIcon = { link = 'TreeFileIcon' } + G.NvimTreeFileNameOpened = { link = 'TreeFileNameOpened' } + G.NvimTreeSpecialFile = { link = 'TreeSpecialFile' } + G.NvimTreeRootFolder = { link = 'TreeRootFolder' } + G.NvimTreeGitDirty = { link = 'TreeGitDirty' } + G.NvimTreeGitAdded = { link = 'TreeGitAdded' } + G.NvimTreeGitNew = { link = 'TreeGitNew' } + G.NvimTreeGitDeleted = { link = 'TreeGitDeleted' } + G.NvimTreeGitStaged = { link = 'TreeGitStaged' } + G.NvimTreeGitConflict = { link = 'TreeGitConflict' } + G.NvimTreeGitModified = { link = 'TreeGitModified' } + G.NvimTreeIndentMarker = { link = 'TreeIndentMarker' } + G.NvimTreeWinSeparator = { link = 'TreeWinSeparator' } + G.NvimTreeCursorLine = { link = 'TreeCursorLine' } + G.NvimTreeCursor = { link = 'TreeCursor' } + G.NvimTreeSymlink = { link = 'TreeSymlink' } - -- Neo tree. - G.NeoTreeCursorLine = { link = 'TreeCursorLine' } - G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' } - G.NeoTreeRootName = { link = 'TreeRootName' } - G.NeoTreeRootFolder = { link = 'TreeRootFolder' } - G.NeoTreeFileIcon = { link = 'TreeFileIcon' } - G.NeoTreeFileNameOpened = { link = 'TreeFileNameOpened' } - G.NeoTreeFolderName = { link = 'TreeFolderName' } - G.NeoTreeOpenedFolderName = { link = 'TreeFolderName' } - G.NeoTreeEmptyFolderName = { link = 'TreeFolderName' } - G.NeoTreeSpecialFile = { link = 'TreeSpecialFile' } - G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' } - G.NeoTreeGitAdded = { link = 'TreeGitAdded' } - G.NeoTreeGitNew = { link = 'TreeGitNew' } - G.NeoTreeGitDirty = { link = 'TreeGitDirty' } - G.NeoTreeGitDeleted = { link = 'TreeGitDeleted' } - G.NeoTreeGitStaged = { link = 'TreeGitStaged' } - G.NeoTreeGitConflict = { link = 'TreeGitConflict' } - G.NeoTreeGitModified = { link = 'TreeGitModified' } - G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' } - G.NeoTreeWinSeparator = { link = 'TreeWinSeparator' } - G.NeoTreeCursor = { link = 'TreeCursor' } - G.NeoTreeNormal = { link = 'TreeNormal' } - G.NeoTreeNormalNC = { link = 'TreeNormalNC' } - G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' } - G.NeoTreeTitleBar = { link = 'TreeTitleBar' } - G.NeoTreeFloatBorder = { link = 'TreeFloatBorder' } + -- Neo tree. + G.NeoTreeCursorLine = { link = 'TreeCursorLine' } + G.NeoTreeDirectoryIcon = { link = 'TreeFolderIcon' } + G.NeoTreeRootName = { link = 'TreeRootName' } + G.NeoTreeRootFolder = { link = 'TreeRootFolder' } + G.NeoTreeFileIcon = { link = 'TreeFileIcon' } + G.NeoTreeFileNameOpened = { link = 'TreeFileNameOpened'} + G.NeoTreeFolderName = { link = 'TreeFolderName' } + G.NeoTreeOpenedFolderName = { link = 'TreeFolderName' } + G.NeoTreeEmptyFolderName = { link = 'TreeFolderName' } + G.NeoTreeSpecialFile = { link = 'TreeSpecialFile' } + G.NeoTreeIndentMarker = { link = 'TreeIndentMarker' } + G.NeoTreeGitAdded = { link = 'TreeGitAdded' } + G.NeoTreeGitNew = { link = 'TreeGitNew' } + G.NeoTreeGitDirty = { link = 'TreeGitDirty' } + G.NeoTreeGitDeleted = { link = 'TreeGitDeleted' } + G.NeoTreeGitStaged = { link = 'TreeGitStaged' } + G.NeoTreeGitConflict = { link = 'TreeGitConflict'} + G.NeoTreeGitModified = { link = 'TreeGitModified' } + G.NeoTreeGitUntracked = { link = 'TreeGitUntracked' } + G.NeoTreeWinSeparator = { link = 'TreeWinSeparator' } + G.NeoTreeCursor = { link = 'TreeCursor' } + G.NeoTreeNormal = { link = 'TreeNormal' } + G.NeoTreeNormalNC = { link = 'TreeNormalNC' } + G.NeoTreeSymbolicLinkTarget = { link = 'TreeSymlink' } + G.NeoTreeTitleBar = { link = 'TreeTitleBar' } + G.NeoTreeFloatBorder = { link = 'TreeFloatBorder' } - -- Noice Flat. - G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } - G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } - G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } - G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } - G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } - G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } - G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } - G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } - G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } - G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } - G.NoiceCmdlinePopup = { bg = C.bg_float } + -- Noice Flat. + G.NoiceLspProgressTitle = { fg = C.yellow.base, bg = C.bg, bold = true } + G.NoiceLspProgressClient = { fg = C.gray4, bg = C.bg } + G.NoiceLspProgressSpinner = { fg = C.cyan.bright, bg = C.bg } + G.NoiceFormatProgressDone = { bg = C.green.bright, fg = C.black0 } + G.NoiceFormatProgressTodo = { bg = C.gray5, fg = C.black0 } + G.NoiceCmdline = { bg = C.bg_dark, fg = C.fg } + G.NoiceCmdlineIcon = { bg = C.bg_float, fg = C.yellow.base } + G.NoiceCmdlineIconSearch = { bg = C.bg_dark, fg = C.yellow.base } + G.NoicePopupBorder = { fg = C.black0, bg = C.bg_float } + G.NoiceCmdlinePopupBorder = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopupBorderSearch = { link = 'NoicePopupBorder' } + G.NoiceCmdlinePopup = { bg = C.bg_float } - -- Noice Classic. - if O.noice.style == 'classic' then - G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlinePopup = { bg = C.bg } - G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } - G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } - end + -- Noice Classic. + if O.noice.style == 'classic' then + G.NoiceCmdline = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlinePopup = { bg = C.bg } + G.NoicePopupBorder = { bg = C.bg, fg = C.cyan.base } + G.NoiceCmdlineIcon = { bg = C.bg, fg = C.yellow.bright } + end - -- Nvim cmp. - G.CmpItemAbbrDeprecated = { fg = C.grey4 } - G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } - G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } - G.CmpItemKindField = { link = '@field' } - G.CmpItemKindProperty = { link = '@property' } - G.CmpItemKindEvent = { link = 'Type' } - G.CmpItemKindText = { fg = C.grey4 } - G.CmpItemKindEnum = { link = 'Type' } - G.CmpItemKindKeyword = { link = 'Keyword' } - G.CmpItemKindConstant = { link = 'Constant' } - G.CmpItemKindConstructor = { link = 'Function' } - G.CmpItemKindReference = { fg = C.cyan.base } - G.CmpItemKindFunction = { link = 'Function' } - G.CmpItemKindStruct = { link = 'Type' } - G.CmpItemKindClass = { link = 'Type' } - G.CmpItemKindModule = { fg = C.yellow.dim } - G.CmpItemKindOperator = { link = 'Operator' } - G.CmpItemKindVariable = { fg = C.cyan.base } - G.CmpItemKindFile = { fg = C.blue1 } - G.CmpItemKindUnit = { link = 'Constant' } - G.CmpItemKindSnippet = { fg = C.blue1 } - G.CmpItemKindFolder = { fg = C.yellow.dark } - G.CmpItemKindMethod = { link = 'Function' } - G.CmpItemKindValue = { link = 'Constant' } - G.CmpItemKindEnumMember = { link = 'Type' } - G.CmpItemKindInterface = { link = 'Type' } - G.CmpItemKindColor = { link = 'Constant' } - G.CmpItemKindTypeParameter = { link = 'Type' } - G.CmpItemKindTabNine = { fg = C.red.base } - G.CmpItemKindCopilot = { fg = C.red.base } + -- Nvim cmp. + G.CmpItemAbbrDeprecated = { fg = C.grey4 } + G.CmpItemAbbrMatch = { fg = C.blue1, bold = true } + G.CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' } + G.CmpItemKindField = { link = '@field' } + G.CmpItemKindProperty = { link = '@property' } + G.CmpItemKindEvent = { link = 'Type' } + G.CmpItemKindText = { fg = C.grey4 } + G.CmpItemKindEnum = { link = 'Type' } + G.CmpItemKindKeyword = { link = 'Keyword' } + G.CmpItemKindConstant = { link = 'Constant' } + G.CmpItemKindConstructor = { link = 'Function' } + G.CmpItemKindReference = { fg = C.cyan.base } + G.CmpItemKindFunction = { link = 'Function' } + G.CmpItemKindStruct = { link = 'Type' } + G.CmpItemKindClass = { link = 'Type' } + G.CmpItemKindModule = { fg = C.yellow.dim } + G.CmpItemKindOperator = { link = 'Operator' } + G.CmpItemKindVariable = { fg = C.cyan.base } + G.CmpItemKindFile = { fg = C.blue1 } + G.CmpItemKindUnit = { link = 'Constant' } + G.CmpItemKindSnippet = { fg = C.blue1 } + G.CmpItemKindFolder = { fg = C.yellow.dark } + G.CmpItemKindMethod = { link = 'Function' } + G.CmpItemKindValue = { link = 'Constant' } + G.CmpItemKindEnumMember = { link = 'Type' } + G.CmpItemKindInterface = { link = 'Type' } + G.CmpItemKindColor = { link = 'Constant' } + G.CmpItemKindTypeParameter = { link = 'Type' } + G.CmpItemKindTabNine = { fg = C.red.base } + G.CmpItemKindCopilot = { fg = C.red.base } - -- Nvim DAP. - G.DapBreakPoint = { fg = C.red.bright } + -- Nvim DAP. + G.DapBreakPoint = { fg = C.red.bright } - -- Nvim DAP UI. - G.DapUINormal = { bg = C.bg_float } - G.DapUIStop = { fg = C.red.bright, bold = true } - G.DapUIRestart = { fg = C.green.bright, bold = true } - G.DapUIPlayPause = { fg = C.green.bright, bold = true } - G.DapUIStepInto = { fg = C.blue2, bold = true } - G.DapUIStepOver = { fg = C.blue2, bold = true } - G.DapUIStepOut = { fg = C.blue2, bold = true } - G.DapUIStepBack = { fg = C.blue3, bold = true } - G.DapUIValue = { fg = C.magenta.bright } - G.DapUIWatchesValue = { fg = C.green.bright } - G.DapUIType = { fg = C.yellow.base } - G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } - G.DapUIFloatNormal = { bg = C.bg } - G.DapUILineNumber = { fg = C.green.bright } + -- Nvim DAP UI. + G.DapUINormal = { bg = C.bg_float } + G.DapUIStop = { fg = C.red.bright, bold = true } + G.DapUIRestart = { fg = C.green.bright, bold = true } + G.DapUIPlayPause = { fg = C.green.bright, bold = true } + G.DapUIStepInto = { fg = C.blue2, bold = true } + G.DapUIStepOver = { fg = C.blue2, bold = true } + G.DapUIStepOut = { fg = C.blue2, bold = true } + G.DapUIStepBack = { fg = C.blue3, bold = true } + G.DapUIValue = { fg = C.magenta.bright } + G.DapUIWatchesValue = { fg = C.green.bright } + G.DapUIType = { fg = C.yellow.base } + G.DapUIFloatBorder = { fg = C.border_nb, bg = C.bg } + G.DapUIFloatNormal = { bg = C.bg } + G.DapUILineNumber = { fg = C.green.bright } - -- Notify. - G.NotifyBackground = { bg = C.bg_float } - G.NotifyERRORBorder = { fg = C.error } - G.NotifyERRORIcon = { fg = C.error } - G.NotifyERRORTitle = { fg = C.error, bold = true } - G.NotifyERRORBody = { fg = C.fg } - G.NotifyWARNBorder = { fg = C.warn } - G.NotifyWARNIcon = { fg = C.warn } - G.NotifyWARNTitle = { fg = C.warn, bold = true } - G.NotifyWARNBody = { fg = C.fg } - G.NotifyINFOBorder = { fg = C.info } - G.NotifyINFOIcon = { fg = C.info } - G.NotifyINFOTitle = { fg = C.info, bold = true } - G.NotifyINFOBody = { fg = C.fg } - G.NotifyDEBUGBorder = { fg = C.orange.bright } - G.NotifyDEBUGIcon = { fg = C.orange.bright } - G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } - G.NotifyDEBUGBody = { fg = C.fg } - G.NotifyTRACEBorder = { fg = C.gray5 } - G.NotifyTRACEIcon = { fg = C.gray5 } - G.NotifyTRACETitle = { fg = C.gray5, bold = true } - G.NotifyTRACEBody = { fg = C.fg } + -- Notify. + G.NotifyBackground = { bg = C.bg_float } + G.NotifyERRORBorder = { fg = C.error } + G.NotifyERRORIcon = { fg = C.error } + G.NotifyERRORTitle = { fg = C.error, bold = true } + G.NotifyERRORBody = { fg = C.fg } + G.NotifyWARNBorder = { fg = C.warn } + G.NotifyWARNIcon = { fg = C.warn } + G.NotifyWARNTitle = { fg = C.warn, bold = true } + G.NotifyWARNBody = { fg = C.fg } + G.NotifyINFOBorder = { fg = C.info } + G.NotifyINFOIcon = { fg = C.info } + G.NotifyINFOTitle = { fg = C.info, bold = true } + G.NotifyINFOBody = { fg = C.fg } + G.NotifyDEBUGBorder = { fg = C.orange.bright } + G.NotifyDEBUGIcon = { fg = C.orange.bright } + G.NotifyDEBUGTitle = { fg = C.orange.bright, bold = true } + G.NotifyDEBUGBody = { fg = C.fg } + G.NotifyTRACEBorder = { fg = C.gray5 } + G.NotifyTRACEIcon = { fg = C.gray5 } + G.NotifyTRACETitle = { fg = C.gray5, bold = true } + G.NotifyTRACEBody = { fg = C.fg } - -- Telescope Classic. - G.TelescopeNormal = { bg = C.bg } - G.TelescopePromptNormal = { bg = C.bg } - G.TelescopeResultsNormal = { bg = C.bg } - G.TelescopePreviewNormal = { bg = C.bg } - G.TelescopePreviewLine = { bg = C.gray2 } - G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } - G.TelescopeBorder = { fg = C.white0, bg = C.bg } - G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } - G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } - G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } - G.TelescopeMatching = { bold = true } - G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } - G.TelescopeMultiSelection = { bg = C.bg } + -- Telescope Classic. + G.TelescopeNormal = { bg = C.bg } + G.TelescopePromptNormal = { bg = C.bg } + G.TelescopeResultsNormal = { bg = C.bg } + G.TelescopePreviewNormal = { bg = C.bg } + G.TelescopePreviewLine = { bg = C.gray2 } + G.TelescopeSelection = { bg = C.bg, fg = C.yellow.bright, bold = false } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopePreviewTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeResultsTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopePromptTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeTitle = { fg = C.white0, bg = C.bg, bold = true } + G.TelescopeBorder = { fg = C.white0, bg = C.bg } + G.TelescopePromptBorder = { fg = C.white0, bg = C.bg } + G.TelescopeResultsBorder = { fg = C.white0, bg = C.bg } + G.TelescopePreviewBorder = { fg = C.white0, bg = C.bg } + G.TelescopeMatching = { bold = true } + G.TelescopePromptPrefix = { bg = C.bg, fg = C.orange.bright } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg, bold = true } + G.TelescopeMultiSelection = { bg = C.bg } - -- Telescope Flat. - if O.telescope.style == 'flat' then - G.TelescopeNormal = { bg = C.bg_float } - G.TelescopePromptNormal = { bg = C.black2 } - G.TelescopeResultsNormal = { bg = C.bg_float } - G.TelescopePreviewNormal = { bg = C.bg_float } - G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } - G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } - G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } - G.TelescopeBorder = { fg = C.black0, bg = C.black0 } - G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } - G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } - G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } - G.TelescopeMultiSelection = { bg = C.bg_float } - G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } - G.TelescopePreviewLine = { bg = C.gray1 } - end + -- Telescope Flat. + if O.telescope.style == 'flat' then + G.TelescopeNormal = { bg = C.bg_float } + G.TelescopePromptNormal = { bg = C.black2 } + G.TelescopeResultsNormal = { bg = C.bg_float } + G.TelescopePreviewNormal = { bg = C.bg_float } + G.TelescopeSelection = { bg = C.bg_float, fg = C.yellow.bright } + G.TelescopeSelectionCaret = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopePreviewTitle = { bg = C.blue2, fg = C.black0, bold = true } + G.TelescopeResultsTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopePromptTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeTitle = { bg = C.orange.base, fg = C.black0, bold = true } + G.TelescopeBorder = { fg = C.black0, bg = C.black0 } + G.TelescopePromptBorder = { bg = C.black2, fg = C.black0 } + G.TelescopeResultsBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopePreviewBorder = { bg = C.bg_float, fg = C.black0 } + G.TelescopeMultiIcon = { fg = C.yellow.bright, bg = C.bg_float, bold = true } + G.TelescopeMultiSelection = { bg = C.bg_float } + G.TelescopePromptPrefix = { bg = C.black2, fg = C.orange.bright } + G.TelescopePreviewLine = { bg = C.gray1 } + end - -- Treesitter. - -- LSP Semantic Token Groups - -- Types follow the pattern @lsp.type.. - -- These groups are for the Neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - --- Misc - G['@comment'] = { link = 'Comment' } - --G['@comment.documentation'] = { link = 'Comment' } - G['@comment.documentation'] = { link = 'Comment' } - G['@comment.note'] = { fg = C.hint } - G['@comment.error'] = { fg = C.error } - G['@comment.hint'] = { fg = C.hint } - G['@comment.info'] = { fg = C.info } - G['@comment.warning'] = { fg = C.warning } - G['@comment.todo'] = { fg = C.todo } - G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. - --- Punctuation - G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` - G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. - G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. - G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } - --- Literals - G['@string'] = { link = 'String' } - G['@string.documentation'] = { link = 'String' } - G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. - G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. - --- Functions - G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. - G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] - --- Keywords - G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. - G['@keyword.conditional'] = { link = 'Conditional' } - G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. - G['@keyword.debug'] = { link = 'Debug' } - G['@keyword.directive'] = { link = 'PreProc' } - G['@keyword.directive.define'] = { link = 'Define' } - G['@keyword.exception'] = { link = 'Exception' } - G['@keyword.export'] = { link = 'Keyword' } - G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. - G['@keyword.import'] = { link = 'Include' } - G['@keyword.operator'] = { link = 'Keyword' } - G['@keyword.repeat'] = { link = 'Repeat' } - G['@keyword.return'] = { link = 'Keyword' } - G['@keyword.storage'] = { link = 'StorageClass' } - G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. - --- Types - G['@type.builtin'] = { link = 'Type' } - G['@field'] = { link = 'Field' } -- For fields. - G['@property'] = { link = 'Field' } - --- Identifiers - G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. - G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. - G['@variable.member'] = { link = 'Field' } - --- Text - -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text - -- G["@text.literal.markdown"] = { } - G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. - G['@text.strong'] = { bold = true } - G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. - G['@text.underline'] = { underline = true } -- For text to be represented with an underline. - G['@text.strike'] = { strikethrough = true } -- For strikethrough text. - G['@text.title'] = { link = 'Title' } -- Text that is part of a title. - G['@text.uri'] = { underline = true } -- Any URI like a link or email. - G['@text.literal'] = { link = 'String' } - G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@text.reference'] = { link = 'Link' } - G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. - G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. - G['@text.warning'] = { fg = C.warning } - G['@text.danger'] = { fg = C.error } - G['@text.diff.add'] = { link = 'DiffAdd' } - G['@text.diff.delete'] = { link = 'DiffDelete' } - G['@text.todo'] = { link = 'Todo' } - G['@text.note'] = { link = 'Note' } - --- Markup - G['@markup'] = { link = '@none' } - G['@markup.emphasis'] = { italic = true } - G['@markup.environment'] = { link = 'Macro' } - G['@markup.environment.name'] = { link = 'Type' } - G['@markup.heading'] = { link = 'Title' } - G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } - G['@markup.heading.2'] = { fg = C.orange.base, bold = true } - G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } - G['@markup.heading.4'] = { fg = C.green.base } - G['@markup.heading.5'] = { fg = C.blue2, italic = true } - G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } - G['@markup.italic'] = { italic = true } - G['@markup.list'] = { link = '@operator' } - G['@markup.list.checked'] = { link = 'Field' } - G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } - G['@markup.list.unchecked'] = { fg = C.fg } - G['@markup.link'] = { fg = C.cyan.base } - G['@markup.link.label'] = { link = 'SpecialChar' } - G['@markup.link.label.symbol'] = { link = 'Identifier' } - G['@markup.link.url'] = { link = 'Underlined' } - G['@markup.math'] = { link = 'Special' } - G['@markup.raw'] = { link = 'String' } - G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } - G['@markup.strong'] = { bold = true } - G['@markup.strikethrough'] = { strikethrough = true } - G['@markup.underline'] = { underline = true } - -- TSX - G['@tag.tsx'] = { fg = C.blue1 } - G['@constructor.tsx'] = { fg = C.blue1 } - G['@tag.delimiter.tsx'] = { fg = C.blue1 } - --LSP Semantic Token Groups - G['@lsp.type.boolean'] = { link = 'Boolean' } - G['@lsp.type.builtinType'] = { link = 'Type' } - G['@lsp.type.comment'] = { link = 'Comment' } - G['@lsp.type.enum'] = { link = 'Type' } - G['@lsp.type.enumMember'] = { link = 'Field' } - G['@lsp.type.escapeSequence'] = { link = '@string.escape' } - G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } - G['@lsp.type.interface'] = { link = 'Keyword' } - G['@lsp.type.keyword'] = { link = 'Keyword' } - G['@lsp.type.namespace'] = { link = 'Namespace' } - G['@lsp.type.number'] = { link = 'Number' } - G['@lsp.type.operator'] = { link = '@operator' } - G['@lsp.type.parameter'] = { link = '@parameter' } - G['@lsp.type.property'] = { link = '@property' } - G['@lsp.type.selfKeyword'] = { link = 'Builtin' } - G['@lsp.type.string.rust'] = { link = 'String' } - G['@lsp.type.typeAlias'] = { link = 'Type' } - G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } - G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables - G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } - G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.keyword.async'] = { link = 'Macro' } - G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } - G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } - G['@lsp.typemod.operator.injected'] = { link = 'Operator' } - G['@lsp.typemod.string.injected'] = { link = 'String' } - G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } - G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } - G['@lsp.typemod.variable.injected'] = { link = 'Variable' } - G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } - -- Things that seems to be missing? - G['@annotation'] = { link = 'PreProc' } - G['@diff.plus'] = { link = 'DiffAdd' } - G['@diff.minus'] = { link = 'DiffDelete' } - G['@diff.delta'] = { link = 'DiffChange' } - G['@character'] = { link = 'Character' } - G['@character.special'] = { link = 'SpecialChar' } - G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. - G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. - G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` - G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` - G['@constant'] = { link = 'Constant' } - G['@number'] = { link = 'Constant' } - G['@float'] = { link = 'Constant' } - G['@boolean'] = { link = 'Constant' } - G['@constant.macro'] = { link = 'Constant' } - G['@constant.builtin'] = { link = 'Constant' } - G['@repeat'] = { link = 'Keyword' } - G['@conditional'] = { link = 'Keyword' } - G['@class'] = { link = 'Keyword' } - G['@include'] = { link = 'Include' } - G['@macro'] = { link = 'Macro' } - G['@module'] = { fg = C.yellow.base } - G['@module.builtin'] = { link = 'Builtin' } - G['@preproc'] = { link = 'Macro' } - G['@attribute'] = { link = 'Macro' } - G['@function.macro'] = { link = 'Macro' } - G['@define'] = { link = 'Macro' } - G['@exception'] = { link = 'Macro' } - G['@function'] = { link = 'Function' } - G['@method'] = { link = 'Function' } - G['@method.call'] = { link = 'Function' } - G['@function.call'] = { link = 'Function' } - G['@function.builtin'] = { link = 'Function' } - G['@property.cpp'] = { fg = C.cyan.base } - G['@namespace'] = { fg = C.yellow.dim } - G['@type'] = { link = 'Type' } - G['@type.definition'] = { link = 'Type' } - G['@type.qualifier'] = { link = 'Keyword' } - G['@storageclass'] = { link = 'Keyword' } - G['@none'] = { link = 'None' } + -- Treesitter. + -- LSP Semantic Token Groups + -- Types follow the pattern @lsp.type.. + -- These groups are for the Neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + --- Misc + G['@comment'] = { link = 'Comment' } + --G['@comment.documentation'] = { link = 'Comment' } + G['@comment.documentation'] = { link = 'Comment' } + G['@comment.note'] = { fg = C.hint } + G['@comment.error'] = { fg = C.error } + G['@comment.hint'] = { fg = C.hint } + G['@comment.info'] = { fg = C.info } + G['@comment.warning'] = { fg = C.warning } + G['@comment.todo'] = { fg = C.todo } + G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C. + --- Punctuation + G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.` + G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens. + G['@punctuation.special'] = { link = 'Macro' } -- For special punctuation that does not fall in the categories before. + G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true } + --- Literals + G['@string'] = { link = 'String' } + G['@string.documentation'] = { link = 'String' } + G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string. + G['@string.regex'] = { fg = C.magenta.bright } -- For regexes. + --- Functions + G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function. + G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99] + --- Keywords + G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories. + G['@keyword.conditional'] = { link = 'Conditional' } + G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines. + G['@keyword.debug'] = { link = 'Debug' } + G['@keyword.directive'] = { link = 'PreProc' } + G['@keyword.directive.define'] = { link = 'Define' } + G['@keyword.exception'] = { link = 'Exception' } + G['@keyword.export'] = { link = 'Keyword' } + G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a function. + G['@keyword.import'] = { link = 'Include' } + G['@keyword.operator'] = { link = 'Keyword' } + G['@keyword.repeat'] = { link = 'Repeat' } + G['@keyword.return'] = { link = 'Keyword' } + G['@keyword.storage'] = { link = 'StorageClass' } + G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua. + --- Types + G['@type.builtin'] = { link = 'Type' } + G['@field'] = { link = 'Field' } -- For fields. + G['@property'] = { link = 'Field' } + --- Identifiers + G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight. + G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`. + G['@variable.member'] = { link = 'Field' } + --- Text + -- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text + -- G["@text.literal.markdown"] = { } + G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language. + G['@text.strong'] = { bold = true } + G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis. + G['@text.underline'] = { underline = true } -- For text to be represented with an underline. + G['@text.strike'] = { strikethrough = true } -- For strikethrough text. + G['@text.title'] = { link = 'Title' } -- Text that is part of a title. + G['@text.uri'] = { underline = true } -- Any URI like a link or email. + G['@text.literal'] = { link = 'String' } + G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@text.reference'] = { link = 'Link' } + G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens. + G['@text.todo.checked'] = { fg = C.green.bright } -- For brackets and parens. + G['@text.warning'] = { fg = C.warning } + G['@text.danger'] = { fg = C.error } + G['@text.diff.add'] = { link = 'DiffAdd' } + G['@text.diff.delete'] = { link = 'DiffDelete' } + G['@text.todo'] = { link = 'Todo' } + G['@text.note'] = { link = 'Note' } + --- Markup + G['@markup'] = { link = '@none' } + G['@markup.emphasis'] = { italic = true } + G['@markup.environment'] = { link = 'Macro' } + G['@markup.environment.name'] = { link = 'Type' } + G['@markup.heading'] = { link = 'Title' } + G['@markup.heading.1'] = { fg = C.yellow.base, bold = true } + G['@markup.heading.2'] = { fg = C.orange.base, bold = true } + G['@markup.heading.3'] = { fg = C.magenta.base, bold = true } + G['@markup.heading.4'] = { fg = C.green.base } + G['@markup.heading.5'] = { fg = C.blue2, italic = true } + G['@markup.heading.6'] = { fg = C.cyan.base, italic = true } + G['@markup.italic'] = { italic = true } + G['@markup.list'] = { link = '@operator' } + G['@markup.list.checked'] = { link = 'Field' } + G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true } + G['@markup.list.unchecked'] = { fg = C.fg } + G['@markup.link'] = { fg = C.cyan.base } + G['@markup.link.label'] = { link = 'SpecialChar' } + G['@markup.link.label.symbol'] = { link = 'Identifier' } + G['@markup.link.url'] = { link = 'Underlined' } + G['@markup.math'] = { link = 'Special' } + G['@markup.raw'] = { link = 'String' } + G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg } + G['@markup.strong'] = { bold = true } + G['@markup.strikethrough'] = { strikethrough = true } + G['@markup.underline'] = { underline = true } + -- TSX + G['@tag.tsx'] = { fg = C.blue1 } + G['@constructor.tsx'] = { fg = C.blue1 } + G['@tag.delimiter.tsx'] = { fg = C.blue1 } + --LSP Semantic Token Groups + G['@lsp.type.boolean'] = { link = 'Boolean' } + G['@lsp.type.builtinType'] = { link = 'Type' } + G['@lsp.type.comment'] = { link = 'Comment' } + G['@lsp.type.enum'] = { link = 'Type' } + G['@lsp.type.enumMember'] = { link = 'Field' } + G['@lsp.type.escapeSequence'] = { link = '@string.escape' } + G['@lsp.type.formatSpecifier'] = { link = '@punctuation.special' } + G['@lsp.type.interface'] = { link = 'Keyword' } + G['@lsp.type.keyword'] = { link = 'Keyword' } + G['@lsp.type.namespace'] = { link = 'Namespace' } + G['@lsp.type.number'] = { link = 'Number' } + G['@lsp.type.operator'] = { link = '@operator' } + G['@lsp.type.parameter'] = { link = '@parameter' } + G['@lsp.type.property'] = { link = '@property' } + G['@lsp.type.selfKeyword'] = { link = 'Builtin' } + G['@lsp.type.string.rust'] = { link = 'String' } + G['@lsp.type.typeAlias'] = { link = 'Type' } + G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error } + G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables + G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.enumMember.defaultLibrary'] = { link = 'Constant' } + G['@lsp.typemod.function.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.keyword.async'] = { link = 'Macro' } + G['@lsp.typemod.macro.defaultLibrary'] = { link = 'Macro' } + G['@lsp.typemod.method.defaultLibrary'] = { link = 'Function' } + G['@lsp.typemod.operator.injected'] = { link = 'Operator' } + G['@lsp.typemod.string.injected'] = { link = 'String' } + G['@lsp.typemod.type.defaultLibrary'] = { link = 'Type' } + G['@lsp.typemod.variable.defaultLibrary'] = { link = 'Variable' } + G['@lsp.typemod.variable.injected'] = { link = 'Variable' } + G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' } + -- Things that seems to be missing? + G['@annotation'] = { link = 'PreProc' } + G['@diff.plus'] = { link = 'DiffAdd' } + G['@diff.minus'] = { link = 'DiffDelete' } + G['@diff.delta'] = { link = 'DiffChange' } + G['@character'] = { link = 'Character' } + G['@character.special'] = { link = 'SpecialChar' } + G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string. + G['@tag'] = { fg = C.blue1 } -- Tags like html tag names. + G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/` + G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class` + G['@constant'] = { link = 'Constant' } + G['@number'] = { link = 'Constant' } + G['@float'] = { link = 'Constant' } + G['@boolean'] = { link = 'Constant' } + G['@constant.macro'] = { link = 'Constant' } + G['@constant.builtin'] = { link = 'Constant' } + G['@repeat'] = { link = 'Keyword' } + G['@conditional'] = { link = 'Keyword' } + G['@class'] = { link = 'Keyword' } + G['@include'] = { link = 'Include' } + G['@macro'] = { link = 'Macro' } + G['@module'] = { fg = C.yellow.base } + G['@module.builtin'] = { link = 'Builtin' } + G['@preproc'] = { link = 'Macro' } + G['@attribute'] = { link = 'Macro' } + G['@function.macro'] = { link = 'Macro' } + G['@define'] = { link = 'Macro' } + G['@exception'] = { link = 'Macro' } + G['@function'] = { link = 'Function' } + G['@method'] = { link = 'Function' } + G['@method.call'] = { link = 'Function' } + G['@function.call'] = { link = 'Function' } + G['@function.builtin'] = { link = 'Function' } + G['@property.cpp'] = { fg = C.cyan.base } + G['@namespace'] = { fg = C.yellow.dim } + G['@type'] = { link = 'Type' } + G['@type.definition'] = { link = 'Type' } + G['@type.qualifier'] = { link = 'Keyword' } + G['@storageclass'] = { link = 'Keyword' } + G['@none'] = { link = 'None' } - -- Treesitter context. - local bg - local fg - if O.ts_context.dark_background then - bg = C.black1 - fg = C.gray1 - else - bg = C.gray1 - fg = C.gray4 - end - G.TreesitterContext = { bg = bg } - G.TreesitterContextLineNumber = { fg = fg, bg = bg } + -- Treesitter context. + local bg + local fg + if O.ts_context.dark_background then + bg = C.black1 + fg = C.gray1 + else + bg = C.gray1 + fg = C.gray4 + end + G.TreesitterContext = { bg = bg } + G.TreesitterContextLineNumber = { fg = fg, bg = bg } - -- Neorg - G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } - G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } - G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } - G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } - G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } - G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } - G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } - G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } - G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } - G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } - G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } - G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } + -- Neorg + G['@neorg.headings.1.title'] = { link = '@markup.heading.1' } + G['@neorg.headings.1.prefix'] = { link = '@markup.heading.1' } + G['@neorg.headings.2.title'] = { link = '@markup.heading.2' } + G['@neorg.headings.2.prefix'] = { link = '@markup.heading.2' } + G['@neorg.headings.3.title'] = { link = '@markup.heading.3' } + G['@neorg.headings.3.prefix'] = { link = '@markup.heading.3' } + G['@neorg.headings.4.title'] = { link = '@markup.heading.4' } + G['@neorg.headings.4.prefix'] = { link = '@markup.heading.4' } + G['@neorg.headings.5.title'] = { link = '@markup.heading.5' } + G['@neorg.headings.5.prefix'] = { link = '@markup.heading.5' } + G['@neorg.headings.6.title'] = { link = '@markup.heading.6' } + G['@neorg.headings.6.prefix'] = { link = '@markup.heading.6' } - -- Trouble. - G.TroubleNormal = { bg = C.bg_float } - G.TroubleText = { fg = C.fg } - G.TroubleCount = { fg = C.white1, bg = C.gray2 } - G.TroubleIndent = { fg = C.gray1 } - G.TroubleFile = { fg = C.cyan.bright } - G.TroubleFoldIcon = { fg = C.gray1 } + -- Trouble. + G.TroubleNormal = { bg = C.bg_float } + G.TroubleText = { fg = C.fg } + G.TroubleCount = { fg = C.white1, bg = C.gray2 } + G.TroubleIndent = { fg = C.gray1 } + G.TroubleFile = { fg = C.cyan.bright } + G.TroubleFoldIcon = { fg = C.gray1 } - -- Vimtex. - G.texGroup = { fg = C.fg } - G.texEnvArgName = { fg = C.cyan.base } - G.texMathEnvArgName = { link = 'texEnvArgName' } - G.texArg = { fg = C.cyan.base } - G.texStyleItal = { fg = C.fg, italic = true } - G.texPartArgTitle = { fg = C.cyan.base } - G.texDelim = { fg = C.fg } - G.texMathGroup = { fg = C.fg } - G.texMathArg = { fg = C.fg } - G.texMathZoneEnv = { fg = C.fg } - G.texMathZoneTI = { fg = C.fg } - G.texMathDelim = { fg = C.fg } - G.texMathDelimZoneTI = { fg = C.blue2 } - G.texMathSuper = { fg = C.fg } - G.texFileArg = { fg = C.green.base } - G.texRefArg = { fg = C.magenta.bright } - G.texGroupError = { link = 'DiagnosticError' } - G.texMathSub = { fg = C.fg } - G.texCmdEnv = { fg = C.blue2 } - G.texSpecialChar = { fg = C.orange.base } - G.texLigature = { fg = C.fg } - G.texFileOpt = { fg = C.fg } - G.texVerbZone = { link = 'String' } - G.texLstZone = { link = 'String' } + -- Vimtex. + G.texGroup = { fg = C.fg } + G.texEnvArgName = { fg = C.cyan.base } + G.texMathEnvArgName = { link = 'texEnvArgName' } + G.texArg = { fg = C.cyan.base } + G.texStyleItal = { fg = C.fg, italic = true } + G.texPartArgTitle = { fg = C.cyan.base } + G.texDelim = { fg = C.fg } + G.texMathGroup = { fg = C.fg } + G.texMathArg = { fg = C.fg } + G.texMathZoneEnv = { fg = C.fg } + G.texMathZoneTI = { fg = C.fg } + G.texMathDelim = { fg = C.fg } + G.texMathDelimZoneTI = { fg = C.blue2 } + G.texMathSuper = { fg = C.fg } + G.texFileArg = { fg = C.green.base } + G.texRefArg = { fg = C.magenta.bright } + G.texGroupError = { link = 'DiagnosticError' } + G.texMathSub = { fg = C.fg } + G.texCmdEnv = { fg = C.blue2 } + G.texSpecialChar = { fg = C.orange.base } + G.texLigature = { fg = C.fg } + G.texFileOpt = { fg = C.fg } + G.texVerbZone = { link = 'String' } + G.texLstZone = { link = 'String' } - -- Whichkey. - G.WhichKey = { fg = C.yellow.base } - G.WhichKeyFloat = { bg = C.bg_float } - G.WhichKeyDesc = { fg = C.white0 } - G.WhichKeyGroup = { fg = C.orange.bright, bold = true } - G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } - -- TODO: Unsure. - G.WhichKeySeperator = {} - G.WhichKeyValue = {} + -- Whichkey. + G.WhichKey = { fg = C.yellow.base } + G.WhichKeyFloat = { bg = C.bg_float } + G.WhichKeyDesc = { fg = C.white0 } + G.WhichKeyGroup = { fg = C.orange.bright, bold = true } + G.WhichKeyBorder = { fg = C.black0, bg = C.bg_float } + -- TODO: Unsure. + G.WhichKeySeperator = {} + G.WhichKeyValue = {} - -- Rainbow delimiters - G.RainbowDelimiterOrange = { fg = C.orange.base } - G.RainbowDelimiterYellow = { fg = C.yellow.bright } - G.RainbowDelimiterBlue = { fg = C.blue2 } - G.RainbowDelimiterRed = { fg = C.red.bright } - G.RainbowDelimiterGreen = { fg = C.green.bright } + -- Rainbow delimiters + G.RainbowDelimiterOrange = { fg = C.orange.base } + G.RainbowDelimiterYellow = { fg = C.yellow.bright } + G.RainbowDelimiterBlue = { fg = C.blue2 } + G.RainbowDelimiterRed = { fg = C.red.bright } + G.RainbowDelimiterGreen = { fg = C.green.bright } - return G + return G end return M From 5eb06970124147fd294511f440e51a90029a242c Mon Sep 17 00:00:00 2001 From: bini-x Date: Sun, 29 Sep 2024 21:39:02 +0200 Subject: [PATCH 12/15] final... maybe --- lua/nordic/groups/integrations.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 849e52a..3e0ab74 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -101,7 +101,7 @@ function M.get_groups() G.TreeNormal = { fg = C.fg, bg = C.bg } G.TreeNormalNC = { fg = C.fg, bg = C.bg } G.TreeRootFolder = { fg = C.gray4 } - G.TreeRootName = { fg = C.white2 } + G.TreeRootName = G.TreeNormal G.TreeFileIcon = { fg = C.blue2 } G.TreeFileNameOpened = { fg = C.fg } G.TreeSpecialFile = { fg = C.magenta.bright } @@ -113,8 +113,8 @@ function M.get_groups() G.TreeGitDeleted = { fg = C.gray4 } G.TreeGitStaged = { fg = C.gray4 } G.TreeGitUntracked = { fg = C.orange.base } - G.TreeTitleBar = { fg = C.gray2, bg = C.white3 } - G.TreeFloatBorder = { fg = C.white3, bg = C.gray0 } + G.TreeTitleBar = { fg = C.black0, bg = C.blue2, bold = true } + G.TreeFloatBorder = { fg = C.blue2, bg = C.gray0} G.TreeCursorLine = { bg = C.bg_selected } G.TreeCursor = { bg = C.none, fg = C.none } G.TreeFolderIcon = { fg = C.yellow.dim } From b57ca979622da7492b18793141958c9a35f8d4ac Mon Sep 17 00:00:00 2001 From: bini-x Date: Sun, 29 Sep 2024 22:04:44 +0200 Subject: [PATCH 13/15] final... maybe (v2) --- lua/nordic/groups/integrations.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 3e0ab74..c3ebc57 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -101,7 +101,7 @@ function M.get_groups() G.TreeNormal = { fg = C.fg, bg = C.bg } G.TreeNormalNC = { fg = C.fg, bg = C.bg } G.TreeRootFolder = { fg = C.gray4 } - G.TreeRootName = G.TreeNormal + G.TreeRootName = { fg = C.fg } G.TreeFileIcon = { fg = C.blue2 } G.TreeFileNameOpened = { fg = C.fg } G.TreeSpecialFile = { fg = C.magenta.bright } From c8ec4b176ec57db409a69c3bfcd6ccb7dc1339e1 Mon Sep 17 00:00:00 2001 From: bini <70219992+bini-x@users.noreply.github.com> Date: Thu, 3 Oct 2024 07:05:27 +0200 Subject: [PATCH 14/15] made rootName bold --- lua/nordic/groups/integrations.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index c3ebc57..1f8bdb7 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -101,7 +101,7 @@ function M.get_groups() G.TreeNormal = { fg = C.fg, bg = C.bg } G.TreeNormalNC = { fg = C.fg, bg = C.bg } G.TreeRootFolder = { fg = C.gray4 } - G.TreeRootName = { fg = C.fg } + G.TreeRootName = { fg = C.fg, bold = true } G.TreeFileIcon = { fg = C.blue2 } G.TreeFileNameOpened = { fg = C.fg } G.TreeSpecialFile = { fg = C.magenta.bright } From fd075e892f83df9e7ca74b9d9dacff7809104635 Mon Sep 17 00:00:00 2001 From: bini <70219992+bini-x@users.noreply.github.com> Date: Mon, 21 Oct 2024 19:43:32 +0200 Subject: [PATCH 15/15] new changes made --- lua/nordic/groups/integrations.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lua/nordic/groups/integrations.lua b/lua/nordic/groups/integrations.lua index 1f8bdb7..e3d9cd2 100644 --- a/lua/nordic/groups/integrations.lua +++ b/lua/nordic/groups/integrations.lua @@ -100,12 +100,11 @@ function M.get_groups() -- Tree Groups G.TreeNormal = { fg = C.fg, bg = C.bg } G.TreeNormalNC = { fg = C.fg, bg = C.bg } - G.TreeRootFolder = { fg = C.gray4 } G.TreeRootName = { fg = C.fg, bold = true } G.TreeFileIcon = { fg = C.blue2 } G.TreeFileNameOpened = { fg = C.fg } G.TreeSpecialFile = { fg = C.magenta.bright } - G.TreeGitConflict = { fg = C.magenta.bright } + G.TreeGitConflict = { fg = C.red.base } G.TreeGitModified = { fg = C.git.change } G.TreeGitDirty = { fg = C.gray4 } G.TreeGitAdded = { fg = C.git.add } @@ -113,15 +112,15 @@ function M.get_groups() G.TreeGitDeleted = { fg = C.gray4 } G.TreeGitStaged = { fg = C.gray4 } G.TreeGitUntracked = { fg = C.orange.base } - G.TreeTitleBar = { fg = C.black0, bg = C.blue2, bold = true } - G.TreeFloatBorder = { fg = C.blue2, bg = C.gray0} + G.TreeTitleBar = { link = "WinBar"} + G.TreeFloatBorder = { fg = C.border_fg, bg = C.bg_float } G.TreeCursorLine = { bg = C.bg_selected } G.TreeCursor = { bg = C.none, fg = C.none } G.TreeFolderIcon = { fg = C.yellow.dim } G.TreeIndentMarker = { fg = C.gray4 } G.TreeSymlink = { fg = C.blue2 } G.TreeFolderName = { fg = C.blue1 } - G.TreeWinSeparator = { fg = C.bg_dark, bg = C.bg } + G.TreeWinSeparator = { link = "WinSeparator" } -- Nvim tree. G.NvimTreeNormal = { link = 'TreeNormal' }