diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua index 0e60819..b062e6e 100644 --- a/lua/catppuccino/core/integrations/bufferline.lua +++ b/lua/catppuccino/core/integrations/bufferline.lua @@ -11,7 +11,7 @@ function M.get(cp) BufferLineBufferVisible = { fg = cp.catppuccino1, catppuccino2 = inactive_clr }, BufferLineBufferSelected = { fg = cp.fg, catppuccino2 = cp.catppuccino2 }, BufferLineTab = { fg = cp.catppuccino1, catppuccino2 = cp.catppuccino2 }, - BufferLineTabSelected = { fg = cp.catppuccino6, catppuccino2 = cp.blue }, + BufferLineTabSelected = { fg = cp.catppuccino6, catppuccino2 = cp.catppuccino10 }, BufferLineTabClose = { fg = cp.catppuccino6, catppuccino2 = inactive_clr }, BufferLineIndicatorSelected = { fg = cp.catppuccino2, catppuccino2 = cp.catppuccino2 }, -- separators diff --git a/lua/catppuccino/core/integrations/cmp.lua b/lua/catppuccino/core/integrations/cmp.lua index d76deb7..7802b28 100644 --- a/lua/catppuccino/core/integrations/cmp.lua +++ b/lua/catppuccino/core/integrations/cmp.lua @@ -7,7 +7,7 @@ function M.get(cp) CmpItemAbbrDeprecated = { fg = util.darken(cp.catppuccino0, 0.56), stlye = "strikethrough" }, CmpItemAbbrMatch = { fg = cp.fg, style = "bold" }, CmpItemAbbrMatchFuzzy = { fg = cp.fg, style = "bold" }, - CmpItemKind = { fg = cp.blue_br }, + CmpItemKind = { fg = cp.catppuccino10 }, CmpItemMenu = { fg = cp.fg }, } end diff --git a/lua/catppuccino/core/integrations/fern.lua b/lua/catppuccino/core/integrations/fern.lua index 1f8b741..2bc775c 100644 --- a/lua/catppuccino/core/integrations/fern.lua +++ b/lua/catppuccino/core/integrations/fern.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - FernBranchText = { fg = cp.blue }, + FernBranchText = { fg = cp.catppuccino10 }, } end diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua index cc41946..b279be6 100644 --- a/lua/catppuccino/core/integrations/hop.lua +++ b/lua/catppuccino/core/integrations/hop.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { HopNextKey = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino7, style = "bold,underline" }, - HopNextKey1 = { catppuccino2 = cp.catppuccino2, fg = cp.blue, style = "bold" }, + HopNextKey1 = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino10, style = "bold" }, HopNextKey2 = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8, style = "bold,italic" }, HopUnmatched = { catppuccino2 = cp.catppuccino2, fg = cp.comment }, } diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua index d0af913..5d2e42d 100644 --- a/lua/catppuccino/core/integrations/indent_blankline.lua +++ b/lua/catppuccino/core/integrations/indent_blankline.lua @@ -11,7 +11,7 @@ function M.get(cp) hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.catppuccino6} hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8} hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7} - hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.blue} + hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.catppuccino10} hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.catppuccino5} end diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua index bf746e9..7041c08 100644 --- a/lua/catppuccino/core/integrations/lsp_saga.lua +++ b/lua/catppuccino/core/integrations/lsp_saga.lua @@ -9,18 +9,18 @@ function M.get(cp) LspFloatWinNormal = { catppuccino2 = cp.catppuccino2_float }, LspFloatWinBorder = { fg = cp.border_highlight }, LspSagaBorderTitle = { fg = cp.catppuccino3 }, - LspSagaHoverBorder = { fg = cp.blue }, + LspSagaHoverBorder = { fg = cp.catppuccino10 }, LspSagaRenameBorder = { fg = cp.catppuccino8 }, LspSagaDefPreviewBorder = { fg = cp.catppuccino8 }, - LspSagaCodeActionBorder = { fg = cp.blue }, + LspSagaCodeActionBorder = { fg = cp.catppuccino10 }, LspSagaFinderSelection = { fg = cp.catppuccino2_visual }, - LspSagaCodeActionTitle = { fg = cp.blue1 }, + LspSagaCodeActionTitle = { fg = cp.catppuccino101 }, LspSagaCodeActionContent = { fg = cp.purple }, LspSagaSignatureHelpBorder = { fg = cp.catppuccino6 }, ReferencesCount = { fg = cp.purple }, DefinitionCount = { fg = cp.purple }, - DefinitionIcon = { fg = cp.blue }, - ReferencesIcon = { fg = cp.blue }, + DefinitionIcon = { fg = cp.catppuccino10 }, + ReferencesIcon = { fg = cp.catppuccino10 }, TargetWord = { fg = cp.catppuccino3 }, } end diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua index 79e047b..bf88dae 100644 --- a/lua/catppuccino/core/integrations/markdown.lua +++ b/lua/catppuccino/core/integrations/markdown.lua @@ -6,8 +6,8 @@ function M.get(cp) markdownCode = { fg = cp.catppuccino3 }, markdownCodeBlock = { fg = cp.catppuccino3 }, markdownH1 = { fg = cp.catppuccino5, style = "bold" }, - markdownH2 = { fg = cp.blue, style = "bold" }, - markdownLinkText = { fg = cp.blue, style = "underline" }, + markdownH2 = { fg = cp.catppuccino10, style = "bold" }, + markdownLinkText = { fg = cp.catppuccino10, style = "underline" }, } end diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index b4a1ddd..75cfc05 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -6,7 +6,7 @@ function M.get(cp) NeogitBranch = { fg = cp.catppuccino5 }, NeogitRemote = { fg = cp.catppuccino5 }, NeogitHunkHeader = { catppuccino2 = cp.catppuccino2_highlight, fg = cp.fg }, - NeogitHunkHeaderHighlight = { catppuccino2 = cp.fg_gutter, fg = cp.blue }, + NeogitHunkHeaderHighlight = { catppuccino2 = cp.fg_gutter, fg = cp.catppuccino10 }, NeogitDiffContextHighlight = { catppuccino2 = util.darken(cp.fg_gutter, 0.5), fg = cp.fg_alt }, NeogitDiffDeleteHighlight = { fg = cp.diff.delete, catppuccino2 = cp.catppuccino2 }, NeogitDiffAddHighlight = { fg = cp.diff.add, catppuccino2 = cp.catppuccino2 }, diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 324b1f4..f7bde4e 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -6,15 +6,15 @@ function M.get(cp) local root_dir_color = cp.catppuccino2_sidebar if config.integrations.nvimtree.show_root then - root_dir_color = cp.blue + root_dir_color = cp.catppuccino10 end return { - NvimTreeFolderName = { fg = cp.blue }, - NvimTreeFolderIcon = { fg = cp.blue }, + NvimTreeFolderName = { fg = cp.catppuccino10 }, + NvimTreeFolderIcon = { fg = cp.catppuccino10 }, NvimTreeNormal = { fg = cp.fg, catppuccino2 = cp.catppuccino2_sidebar }, - NvimTreeOpenedFolderName = { fg = cp.blue }, - NvimTreeEmptyFolderName = { fg = cp.blue_br }, + NvimTreeOpenedFolderName = { fg = cp.catppuccino10 }, + NvimTreeEmptyFolderName = { fg = cp.catppuccino10 }, NvimTreeIndentMarker = { fg = cp.comment }, NvimTreeVertSplit = { fg = cp.black, catppuccino2 = cp.black }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua index 7dcd602..26f4d1d 100644 --- a/lua/catppuccino/core/integrations/telescope.lua +++ b/lua/catppuccino/core/integrations/telescope.lua @@ -5,7 +5,7 @@ function M.get(cp) TelescopeBorder = { fg = cp.border_highlight }, TelescopeSelectionCaret = { fg = cp.catppuccino3 }, TelescopeSelection = { fg = cp.catppuccino3, catppuccino2 = cp.catppuccino2_highlight }, - TelescopeMatching = { fg = cp.blue }, + TelescopeMatching = { fg = cp.catppuccino10 }, } end diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index 70b9bf5..cdcafd7 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -27,14 +27,14 @@ function M.get(cp) TSField = { fg = cp.catppuccino6 }, -- For fields. rustTSField = { fg = util.darken(cp.catppuccino0, 0.75) }, -- For fields. -- TSFloat = { }; -- For floats. - TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions). + TSFunction = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- For function (calls and definitions). TSFuncBuiltin = { fg = cp.catppuccino3 }, -- For builtin functions: `table.insert` in Lua. TSFuncMacro = { fg = cp.catppuccino6 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. TSInclude = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. TSKeyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. TSKeywordFunction = { fg = cp.catppuccino4, style = cnf.styles.keywords }, -- For keywords used to define a fuction. TSKeywordOperator = { fg = cp.catppuccino3, style = cnf.styles.keywords }, -- For `new` keyword operator - TSLabel = { fg = cp.blue }, -- For labels: `label:` in C and `:label:` in Lua. + TSLabel = { fg = cp.catppuccino10 }, -- For labels: `label:` in C and `:label:` in Lua. -- TSMethod = { }; -- For method calls and definitions. TSNamespace = { fg = cp.catppuccino3 }, -- For identifiers referring to modules and namespaces. -- TSNone = { }; -- TODO: docs @@ -43,13 +43,13 @@ function M.get(cp) TSParameter = { fg = cp.catppuccino7_br }, -- For parameters of a function. -- TSParameterReference= { }; -- For references to parameters of a function. TSProperty = { fg = cp.catppuccino6 }, -- Same as `TSField`. - tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties + tomlTSProperty = { fg = cp.catppuccino10 }, -- Differentiates between string and properties TSPunctDelimiter = { fg = cp.catppuccino8_br }, -- For delimiters ie: `.` TSPunctBracket = { fg = cp.catppuccino6 }, -- For brackets and parenthesis. TSPunctSpecial = { fg = cp.catppuccino0 }, -- For special punctutation that does not fall in the catagories before. TSRepeat = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to loops. -- TSString = { }; -- For strings. - TSStringRegex = { fg = cp.blue, style = cnf.styles.strings }, -- For regexes. + TSStringRegex = { fg = cp.catppuccino10, style = cnf.styles.strings }, -- For regexes. TSStringEscape = { fg = cp.catppuccino5, style = cnf.styles.strings }, -- For escape characters within a string. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. -- TSType = { }; -- For types. diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua index 769054d..614cb0c 100644 --- a/lua/catppuccino/core/integrations/ts_rainbow.lua +++ b/lua/catppuccino/core/integrations/ts_rainbow.lua @@ -5,7 +5,7 @@ function M.get(cp) rainbowcol1 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6}, rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8}, rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino9}, - rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.blue}, + rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino10}, rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino5}, rainbowcol6 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino3}, rainbowcol7 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0}, diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index 0f5aae6..b76be06 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { WhichKey = { fg = cp.catppuccino3 }, - WhichKeyGroup = { fg = cp.blue }, + WhichKeyGroup = { fg = cp.catppuccino10 }, WhichKeyDesc = { fg = cp.catppuccino5 }, WhichKeySeperator = { fg = cp.comment }, WhichKeySeparator = { fg = cp.comment }, @@ -12,4 +12,5 @@ function M.get(cp) } end +print("llo ) return M diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index 780cb33..aa38f36 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -29,11 +29,11 @@ local function get_base() CursorIM = { fg = cp.catppuccino2, catppuccino2 = cp.fg }, -- like Cursor, but used when in IME mode |CursorIM| CursorColumn = { catppuccino2 = cp.catppuccino2_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. CursorLine = { catppuccino2 = cp.catppuccino2_highlight }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. - Directory = { fg = cp.blue }, -- directory names (and other special names in listings) + Directory = { fg = cp.catppuccino10 }, -- directory names (and other special names in listings) EndOfBuffer = { fg = cp.catppuccino2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.error }, -- error messages on the command line VertSplit = { fg = cp.border }, -- the column separating vertically split windows - Folded = { fg = cp.blue, catppuccino2 = cp.fg_gutter }, -- line used for closed folds + Folded = { fg = cp.catppuccino10, catppuccino2 = cp.fg_gutter }, -- line used for closed folds FoldColumn = { catppuccino2 = cp.catppuccino2, fg = cp.comment }, -- 'foldcolumn' SignColumn = { catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2, fg = cp.fg_gutter }, -- column where |signs| are displayed SignColumnSB = { catppuccino2 = cp.catppuccino2_sidebar, fg = cp.fg_gutter }, -- column where |signs| are displayed @@ -44,7 +44,7 @@ local function get_base() ModeMsg = { fg = cp.fg_alt, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea = { fg = cp.catppuccino0 }, -- Area for messages and cmdline MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg = { fg = cp.blue }, -- |more-prompt| + MoreMsg = { fg = cp.catppuccino10 }, -- |more-prompt| NonText = { fg = cp.comment }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. Normal = { fg = cp.fg, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text NormalNC = { fg = cp.fg, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text in non-current windows @@ -55,7 +55,7 @@ local function get_base() PmenuSel = { fg = cp.catppuccino3, catppuccino2 = util.darken(cp.fg_gutter, 0.8) }, -- Popup menu: selected item. PmenuSbar = { catppuccino2 = util.lighten(cp.catppuccino2_popup, 0.95) }, -- Popup menu: scrollbar. PmenuThumb = { catppuccino2 = cp.fg_gutter }, -- Popup menu: Thumb of the scrollbar. - Question = { fg = cp.blue }, -- |hit-enter| prompt and yes/no questions + Question = { fg = cp.catppuccino10 }, -- |hit-enter| prompt and yes/no questions QuickFixLine = { catppuccino2 = cp.catppuccino2_visual, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. Search = { catppuccino2 = cp.catppuccino2_search, fg = cp.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. IncSearch = { catppuccino2 = cp.catppuccino3, fg = cp.black }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" @@ -69,7 +69,7 @@ local function get_base() TabLine = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.fg_gutter }, -- tab pages line, not active tab page label TabLineFill = { catppuccino2 = cp.black }, -- tab pages line, where there are no labels TabLineSel = { fg = cp.fg_alt, catppuccino2 = cp.fg_gutter }, -- tab pages line, active tab page label - Title = { fg = cp.blue, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp. + Title = { fg = cp.catppuccino10, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp. Visual = { catppuccino2 = cp.catppuccino2_visual }, -- Visual mode selection VisualNOS = { catppuccino2 = cp.catppuccino2_visual }, -- Visual mode selection when vim is "Not Owning the Selection". WarningMsg = { fg = cp.warning }, -- warning messages @@ -90,7 +90,7 @@ local function get_base() Float = { fg = cp.catppuccino7_br }, -- a floating point constant: 2.3e10 Boolean = { fg = cp.catppuccino7_br }, -- a boolean constant: TRUE, false Identifier = { fg = cp.catppuccino3, style = cnf.styles.variables }, -- (prefercatppuccino6) any variable name - Function = { fg = cp.blue, style = cnf.styles.functions }, -- function name (also: methods for classes) + Function = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- function name (also: methods for classes) Statement = { fg = cp.catppuccino4 }, -- (prefercatppuccino6) any statement Conditional = { fg = cp.catppuccino6 }, -- if, then, else, endif, switch, etcp. Repeat = { fg = cp.catppuccino6 }, -- for, do, while, etcp. @@ -109,7 +109,7 @@ local function get_base() StorageClass = { fg = cp.catppuccino9 }, -- static, register, volatile, etcp. Structure = { fg = cp.catppuccino9 }, -- struct, union, enum, etcp. Typedef = { fg = cp.catppuccino9 }, -- A typedef - Special = { fg = cp.blue }, -- (prefercatppuccino6) any special symbol + Special = { fg = cp.catppuccino10 }, -- (prefercatppuccino6) any special symbol -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this -- Delimiter = { }, -- character that needs attention @@ -125,15 +125,15 @@ local function get_base() Error = { fg = cp.error }, -- (prefercatppuccino6) any erroneous construct Todo = { catppuccino2 = cp.catppuccino9, fg = cp.catppuccino2, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = cp.catppuccino9 }, - qfFileName = { fg = cp.blue }, + qfFileName = { fg = cp.catppuccino10 }, htmlH1 = { fg = cp.catppuccino5, style = "bold" }, - htmlH2 = { fg = cp.blue, style = "bold" }, + htmlH2 = { fg = cp.catppuccino10, style = "bold" }, -- mkdHeading = { fg = cp.catppuccino7, style = "bold" }, -- mkdCode = { catppuccino2 = cp.terminal_black, fg = cp.fg }, mkdCodeDelimiter = { catppuccino2 = cp.terminal_black, fg = cp.fg }, mkdCodeStart = { fg = cp.catppuccino3, style = "bold" }, mkdCodeEnd = { fg = cp.catppuccino3, style = "bold" }, - -- mkdLink = { fg = cp.blue, style = "underline" }, + -- mkdLink = { fg = cp.catppuccino10, style = "underline" }, -- debugging debugPC = { catppuccino2 = cp.catppuccino2_sidebar }, -- used for highlighting the current line in terminal-debug @@ -147,7 +147,7 @@ local function get_base() diffChanged = { fg = cp.diff.change }, diffOldFile = { fg = cp.catppuccino9 }, diffNewFile = { fg = cp.catppuccino7 }, - diffFile = { fg = cp.blue }, + diffFile = { fg = cp.catppuccino10 }, diffLine = { fg = cp.comment }, diffIndexLine = { fg = cp.catppuccino5 }, DiffAdd = { fg = cp.diff.add, catppuccino2 = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| @@ -164,7 +164,7 @@ local function get_base() GlyphPalette1 = { fg = cp.catppuccino6 }, GlyphPalette2 = { fg = cp.catppuccino8 }, GlyphPalette3 = { fg = cp.catppuccino9 }, - GlyphPalette4 = { fg = cp.blue }, + GlyphPalette4 = { fg = cp.catppuccino10 }, GlyphPalette6 = { fg = cp.catppuccino8_br }, GlyphPalette7 = { fg = cp.fg }, GlyphPalette9 = { fg = cp.catppuccino6 },