diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index dc0b54f..8807039 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -7,7 +7,7 @@ local color_palette = { katppuccino5 = "#E28D8D", -- New York Pink katppuccino6 = "#E7A988", -- Tumbleweed katppuccino7 = "#ADD692", -- Granny Smith Apple - catppuccino9 = "#E3DAA3", -- Megium Champagne + katppuccino8 = "#E3DAA3", -- Megium Champagne catppuccino10 = "#7EA1C8", -- Cerulean Frost catppuccino11 = "#A7B6DC", -- Wild Blue Yonder catppuccino12 = "#6F6A8A", -- Rhythm diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua index 1db7957..a042437 100644 --- a/lua/catppuccino/core/integrations/barbar.lua +++ b/lua/catppuccino/core/integrations/barbar.lua @@ -4,17 +4,17 @@ function M.get(cp) return { BufferCurrent = { bg = cp.catppuccino13, fg = cp.catppuccino11 }, BufferCurrentIndex = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, - BufferCurrentMod = { bg = cp.catppuccino13, fg = cp.catppuccino9 }, + BufferCurrentMod = { bg = cp.catppuccino13, fg = cp.katppuccino8 }, BufferCurrentSign = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, BufferCurrentTarget = { bg = cp.catppuccino13, fg = cp.katppuccino5 }, BufferVisible = { bg = cp.catppuccino15, fg = cp.catppuccino11 }, BufferVisibleIndex = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, - BufferVisibleMod = { bg = cp.catppuccino15, fg = cp.catppuccino9 }, + BufferVisibleMod = { bg = cp.catppuccino15, fg = cp.katppuccino8 }, BufferVisibleSign = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, BufferVisibleTarget = { bg = cp.catppuccino15, fg = cp.katppuccino5 }, BufferInactive = { bg = cp.catppuccino15, fg = cp.catppuccino12 }, BufferInactiveIndex = { bg = cp.catppuccino15, fg = cp.catppuccino12 }, - BufferInactiveMod = { bg = cp.catppuccino15, fg = cp.catppuccino9 }, + BufferInactiveMod = { bg = cp.catppuccino15, fg = cp.katppuccino8 }, BufferInactiveSign = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, BufferInactiveTarget = { bg = cp.catppuccino15, fg = cp.katppuccino5 }, BufferTabpages = { bg = cp.catppuccino15, fg = cp.none }, diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua index b6ddf76..82f7a1f 100644 --- a/lua/catppuccino/core/integrations/dashboard.lua +++ b/lua/catppuccino/core/integrations/dashboard.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { DashboardShortCut = { fg = cp.katppuccino2 }, - DashboardHeader = { fg = cp.catppuccino9 }, + DashboardHeader = { fg = cp.katppuccino8 }, DashboardCenter = { fg = cp.katppuccino7 }, DashboardFooter = { fg = cp.katppuccino6, style = "italic" }, } diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/catppuccino/core/integrations/gitgutter.lua index 8903c3c..e45f7a1 100644 --- a/lua/catppuccino/core/integrations/gitgutter.lua +++ b/lua/catppuccino/core/integrations/gitgutter.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { GitGutterAdd = { fg = cp.catppuccino10 }, - GitGutterChange = { fg = cp.catppuccino9 }, + GitGutterChange = { fg = cp.katppuccino8 }, GitGutterDelete = { fg = cp.katppuccino5 }, } end diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua index 20a1b3c..17221ce 100644 --- a/lua/catppuccino/core/integrations/gitsigns.lua +++ b/lua/catppuccino/core/integrations/gitsigns.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { GitSignsAdd = { fg = cp.catppuccino10, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = cp.catppuccino9, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| + GitSignsChange = { fg = cp.katppuccino8, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| GitSignsDelete = { fg = cp.katppuccino5, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua index db62eaa..0319c14 100644 --- a/lua/catppuccino/core/integrations/indent_blankline.lua +++ b/lua/catppuccino/core/integrations/indent_blankline.lua @@ -7,7 +7,7 @@ function M.get(cp) } if cnf.integrations.indent_blankline.colored_indent_levels then - hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.catppuccino9} + hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.katppuccino8} hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.katppuccino5} hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.katppuccino7} hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.katppuccino6} diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua index 2ff0f1b..80d2761 100644 --- a/lua/catppuccino/core/integrations/lsp_saga.lua +++ b/lua/catppuccino/core/integrations/lsp_saga.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { DiagnosticError = { fg = cp.katppuccino5 }, - DiagnosticWarning = { fg = cp.catppuccino9 }, + DiagnosticWarning = { fg = cp.katppuccino8 }, DiagnosticInformation = { fg = cp.catppuccino10 }, DiagnosticHint = { fg = cp.hint }, LspFloatWinNormal = { bg = cp.catppuccino14 }, diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua index cf8ba35..4c3f576 100644 --- a/lua/catppuccino/core/integrations/native_lsp.lua +++ b/lua/catppuccino/core/integrations/native_lsp.lua @@ -14,12 +14,12 @@ function M.get(cp) LspReferenceWrite = { bg = cp.catppuccino13 }, -- used for highlighting "write" references -- hightlight diagnostics in numberline DiagnosticError = { fg = cp.katppuccino5 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticWarn = { fg = cp.catppuccino9 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticWarn = { fg = cp.katppuccino8 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticInfo = { fg = cp.catppuccino10 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticHint = { fg = cp.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default LspDiagnosticsDefaultError = { fg = cp.katppuccino5 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultWarning = { fg = cp.catppuccino9 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning = { fg = cp.katppuccino8 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultInformation = { fg = cp.catppuccino10 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultHint = { fg = cp.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspSignatureActiveParameter = { fg = cp.katppuccino6 }, @@ -29,15 +29,15 @@ function M.get(cp) -- LspDiagnosticsFloatingHint = { }, -- Used to color "Hint" diagnostic messages in diagnostics float LspDiagnosticsError = { fg = cp.katppuccino5 }, - LspDiagnosticsWarning = { fg = cp.catppuccino9 }, + LspDiagnosticsWarning = { fg = cp.katppuccino8 }, LspDiagnosticsInformation = { fg = cp.catppuccino10 }, LspDiagnosticsHint = { fg = cp.hint }, LspDiagnosticsVirtualTextError = { fg = cp.katppuccino5, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning = { fg = cp.catppuccino9, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text + LspDiagnosticsVirtualTextWarning = { fg = cp.katppuccino8, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text LspDiagnosticsVirtualTextInformation = { fg = cp.catppuccino10, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text LspDiagnosticsVirtualTextHint = { fg = cp.hint, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.katppuccino5 }, -- Used to underline "Error" diagnostics - LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.catppuccino9 }, -- Used to underline "Warning" diagnostics + LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.katppuccino8 }, -- Used to underline "Warning" diagnostics LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.catppuccino10 }, -- Used to underline "Information" diagnostics LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cp.hint }, -- Used to underline "Hint" diagnostics LspCodeLens = { fg = cp.catppuccino12 }, -- virtual text of the codelens diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 7ff6cf4..ccded39 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -20,7 +20,7 @@ function M.get(cp) NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeSymlink = { fg = cp.katppuccino4 }, NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black }, - NvimTreeGitDirty = { fg = cp.catppuccino9 }, + NvimTreeGitDirty = { fg = cp.katppuccino8 }, NvimTreeGitNew = { fg = cp.catppuccino10 }, NvimTreeGitDeleted = { fg = cp.katppuccino5 }, NvimTreeSpecialFile = { fg = cp.katppuccino2 }, diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index 4359233..6ee9999 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -14,7 +14,7 @@ function M.get(cp) -- TSCharacter = { }; -- For characters. -- TScatppuccino12 = { }; -- For catppuccino12 blocks. TSNote = { fg = cp.katppuccino1, bg = cp.catppuccino10 }, - TSWarning = { fg = cp.katppuccino1, bg = cp.catppuccino9 }, + TSWarning = { fg = cp.katppuccino1, bg = cp.katppuccino8 }, TSDanger = { fg = cp.katppuccino1, bg = cp.katppuccino5 }, TSConstructor = { fg = cp.katppuccino4 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. TSConditional = { fg = cp.katppuccino5, style = cnf.styles.keywords }, -- For keywords related to conditionnals. diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua index 190edd8..8dcda91 100644 --- a/lua/catppuccino/core/integrations/ts_rainbow.lua +++ b/lua/catppuccino/core/integrations/ts_rainbow.lua @@ -4,7 +4,7 @@ function M.get(cp) return { rainbowcol1 = {bg = cp.katppuccino1, fg = cp.katppuccino5}, rainbowcol2 = {bg = cp.katppuccino1, fg = cp.katppuccino7}, - rainbowcol3 = {bg = cp.katppuccino1, fg = cp.catppuccino9}, + rainbowcol3 = {bg = cp.katppuccino1, fg = cp.katppuccino8}, rainbowcol4 = {bg = cp.katppuccino1, fg = cp.catppuccino10}, rainbowcol5 = {bg = cp.katppuccino1, fg = cp.katppuccino4}, rainbowcol6 = {bg = cp.katppuccino1, fg = cp.katppuccino2}, diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index 95cd987..a3b4316 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -60,7 +60,7 @@ local function get_base() IncSearch = { bg = cp.katppuccino4, fg = cp.catppuccino13 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" SpecialKey = { fg = cp.catppuccino11 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| SpellBad = { sp = cp.katppuccino5, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. - SpellCap = { sp = cp.catppuccino9, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellCap = { sp = cp.katppuccino8, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal = { sp = cp.catppuccino10, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare = { sp = cp.katppuccino0, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. StatusLine = { fg = cp.catppuccino11, bg = cp.catppuccino15 }, -- status line of current window @@ -71,7 +71,7 @@ local function get_base() Title = { fg = cp.catppuccino10, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp. Visual = { bg = cp.catppuccino16 }, -- Visual mode selection VisualNOS = { bg = cp.catppuccino16 }, -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg = { fg = cp.catppuccino9 }, -- warning messages + WarningMsg = { fg = cp.katppuccino8 }, -- warning messages Whitespace = { fg = cp.catppuccino13 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' WildMenu = { bg = cp.catppuccino12 }, -- current match in 'wildmenu' completion -- These groups are not listed as default vim groups, @@ -104,10 +104,10 @@ local function get_base() -- Macro = { }, -- same as Define -- PreCondit = { }, -- preprocessor #if, #else, #endif, etcp. - Type = { fg = cp.catppuccino9 }, -- (preferkatppuccino5) int, long, char, etcp. - StorageClass = { fg = cp.catppuccino9 }, -- static, register, volatile, etcp. - Structure = { fg = cp.catppuccino9 }, -- struct, union, enum, etcp. - Typedef = { fg = cp.catppuccino9 }, -- A typedef + Type = { fg = cp.katppuccino8 }, -- (preferkatppuccino5) int, long, char, etcp. + StorageClass = { fg = cp.katppuccino8 }, -- static, register, volatile, etcp. + Structure = { fg = cp.katppuccino8 }, -- struct, union, enum, etcp. + Typedef = { fg = cp.katppuccino8 }, -- A typedef Special = { fg = cp.catppuccino10 }, -- (preferkatppuccino5) any special symbol -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this @@ -122,8 +122,8 @@ local function get_base() -- Ignore = { }, -- (preferkatppuccino5) left blank, hidden |hl-Ignore| Error = { fg = cp.katppuccino5 }, -- (preferkatppuccino5) any erroneous construct - Todo = { bg = cp.catppuccino9, fg = cp.katppuccino1, style = "bold" }, -- (preferkatppuccino5) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - qfLineNr = { fg = cp.catppuccino9 }, + Todo = { bg = cp.katppuccino8, fg = cp.katppuccino1, style = "bold" }, -- (preferkatppuccino5) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + qfLineNr = { fg = cp.katppuccino8 }, qfFileName = { fg = cp.catppuccino10 }, htmlH1 = { fg = cp.katppuccino4, style = "bold" }, htmlH2 = { fg = cp.catppuccino10, style = "bold" }, @@ -143,26 +143,26 @@ local function get_base() -- diff diffAdded = { fg = cp.catppuccino10 }, diffRemoved = { fg = cp.katppuccino5 }, - diffChanged = { fg = cp.catppuccino9 }, - diffOldFile = { fg = cp.catppuccino9 }, + diffChanged = { fg = cp.katppuccino8 }, + diffOldFile = { fg = cp.katppuccino8 }, diffNewFile = { fg = cp.katppuccino6 }, diffFile = { fg = cp.catppuccino10 }, diffLine = { fg = cp.catppuccino12 }, diffIndexLine = { fg = cp.katppuccino4 }, DiffAdd = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = cp.catppuccino9, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| + DiffChange = { fg = cp.katppuccino8, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| DiffDelete = { fg = cp.katppuccino5, bg = cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt| DiffText = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.katppuccino5 }, healthSuccess = { fg = cp.katppuccino7 }, - healthWarning = { fg = cp.catppuccino9 }, + healthWarning = { fg = cp.katppuccino8 }, -- misc -- glyphs GlyphPalette1 = { fg = cp.katppuccino5 }, GlyphPalette2 = { fg = cp.katppuccino7 }, - GlyphPalette3 = { fg = cp.catppuccino9 }, + GlyphPalette3 = { fg = cp.katppuccino8 }, GlyphPalette4 = { fg = cp.catppuccino10 }, GlyphPalette6 = { fg = cp.katppuccino7 }, GlyphPalette7 = { fg = cp.catppuccino11 }, @@ -216,7 +216,7 @@ local function get_terminal() g.terminal_color_6 = cp.katppuccino5 g.terminal_color_7 = cp.katppuccino6 g.terminal_color_8 = cp.katppuccino7 - g.terminal_color_9 = cp.catppuccino9 + g.terminal_color_9 = cp.katppuccino8 g.terminal_color_10 = cp.catppuccino10 end