diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index 4b0ec51..384efa8 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -10,7 +10,7 @@ local color_palette = { katppuccino8 = "#E3DAA3", -- Megium Champagne katppuccino9 = "#7EA1C8", -- Cerulean Frost katppuccino10 = "#A7B6DC", -- Wild Blue Yonder - catppuccino12 = "#6F6A8A", -- Rhythm + katppuccino11 = "#6F6A8A", -- Rhythm catppuccino13 = "#3e4058", -- Independence catppuccino14 = "#110E17", catppuccino15 = "#1B1927", diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua index 1984d29..5bfa0e4 100644 --- a/lua/catppuccino/core/integrations/barbar.lua +++ b/lua/catppuccino/core/integrations/barbar.lua @@ -12,8 +12,8 @@ function M.get(cp) BufferVisibleMod = { bg = cp.catppuccino15, fg = cp.katppuccino8 }, BufferVisibleSign = { bg = cp.catppuccino15, fg = cp.katppuccino9 }, BufferVisibleTarget = { bg = cp.catppuccino15, fg = cp.katppuccino5 }, - BufferInactive = { bg = cp.catppuccino15, fg = cp.catppuccino12 }, - BufferInactiveIndex = { bg = cp.catppuccino15, fg = cp.catppuccino12 }, + BufferInactive = { bg = cp.catppuccino15, fg = cp.katppuccino11 }, + BufferInactiveIndex = { bg = cp.catppuccino15, fg = cp.katppuccino11 }, BufferInactiveMod = { bg = cp.catppuccino15, fg = cp.katppuccino8 }, BufferInactiveSign = { bg = cp.catppuccino15, fg = cp.katppuccino9 }, BufferInactiveTarget = { bg = cp.catppuccino15, fg = cp.katppuccino5 }, diff --git a/lua/catppuccino/core/integrations/cmp.lua b/lua/catppuccino/core/integrations/cmp.lua index ea71a2c..8439816 100644 --- a/lua/catppuccino/core/integrations/cmp.lua +++ b/lua/catppuccino/core/integrations/cmp.lua @@ -2,8 +2,8 @@ local M = {} function M.get(cp) return { - CmpItemAbbr = { fg = cp.catppuccino12 }, - CmpItemAbbrDeprecated = { fg = cp.catppuccino12, stlye = "strikethrough" }, + CmpItemAbbr = { fg = cp.katppuccino11 }, + CmpItemAbbrDeprecated = { fg = cp.katppuccino11, stlye = "strikethrough" }, CmpItemAbbrMatch = { fg = cp.katppuccino10, style = "bold" }, CmpItemAbbrMatchFuzzy = { fg = cp.katppuccino10, style = "bold" }, CmpItemKind = { fg = cp.katppuccino9 }, diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua index 17166b1..bfc2906 100644 --- a/lua/catppuccino/core/integrations/hop.lua +++ b/lua/catppuccino/core/integrations/hop.lua @@ -5,7 +5,7 @@ function M.get(cp) HopNextKey = { bg = cp.katppuccino1, fg = cp.katppuccino6, style = "bold,underline" }, HopNextKey1 = { bg = cp.katppuccino1, fg = cp.katppuccino9, style = "bold" }, HopNextKey2 = { bg = cp.katppuccino1, fg = cp.katppuccino7, style = "bold,italic" }, - HopUnmatched = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, + HopUnmatched = { bg = cp.katppuccino1, fg = cp.katppuccino11 }, } end diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua index 3509bd6..d481b73 100644 --- a/lua/catppuccino/core/integrations/lightspeed.lua +++ b/lua/catppuccino/core/integrations/lightspeed.lua @@ -35,7 +35,7 @@ function M.get(cp) LightspeedShortcut = {bg = cp.katppuccino1, fg = cp.katppuccino6, style = "italic"}, LightspeedShortcutOverlapped = {bg = cp.katppuccino1, fg = cp.katppuccino6, style = "bold"}, LightspeedMaskedChar = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "undercurl"}, - LightspeedGreyWash = {bg = cp.katppuccino1, fg = cp.catppuccino12}, + LightspeedGreyWash = {bg = cp.katppuccino1, fg = cp.katppuccino11}, LightspeedUnlabeledMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "underline"}, LightspeedOneCharMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "underline"}, LightspeedUniqueChar = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"}, diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua index 592c159..27e27d2 100644 --- a/lua/catppuccino/core/integrations/native_lsp.lua +++ b/lua/catppuccino/core/integrations/native_lsp.lua @@ -40,7 +40,7 @@ function M.get(cp) LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.katppuccino8 }, -- Used to underline "Warning" diagnostics LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.katppuccino9 }, -- 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 + LspCodeLens = { fg = cp.katppuccino11 }, -- virtual text of the codelens } end diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 11fc364..9546220 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -15,7 +15,7 @@ function M.get(cp) NvimTreeNormal = { fg = cp.katppuccino10, bg = cp.catppuccino14 }, NvimTreeOpenedFolderName = { fg = cp.katppuccino9 }, NvimTreeEmptyFolderName = { fg = cp.katppuccino9 }, - NvimTreeIndentMarker = { fg = cp.catppuccino12 }, + NvimTreeIndentMarker = { fg = cp.katppuccino11 }, NvimTreeVertSplit = { fg = cp.black, bg = cp.black }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeSymlink = { fg = cp.katppuccino4 }, diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index 02e6da5..c81b76f 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -12,7 +12,7 @@ function M.get(cp) -- TSAttribute = { }; -- (unstable) TODO: docs TSBoolean = { fg = cp.katppuccino6, style = cnf.styles.keywords }, -- For booleans. -- TSCharacter = { }; -- For characters. - -- TScatppuccino12 = { }; -- For catppuccino12 blocks. + -- TSkatppuccino11 = { }; -- For katppuccino11 blocks. TSNote = { fg = cp.katppuccino1, bg = cp.katppuccino9 }, TSWarning = { fg = cp.katppuccino1, bg = cp.katppuccino8 }, TSDanger = { fg = cp.katppuccino1, bg = cp.katppuccino5 }, diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index d2a7407..d806d2c 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -5,10 +5,10 @@ function M.get(cp) WhichKey = { fg = cp.katppuccino2 }, WhichKeyGroup = { fg = cp.katppuccino9 }, WhichKeyDesc = { fg = cp.katppuccino4 }, - WhichKeySeperator = { fg = cp.catppuccino12 }, - WhichKeySeparator = { fg = cp.catppuccino12 }, + WhichKeySeperator = { fg = cp.katppuccino11 }, + WhichKeySeparator = { fg = cp.katppuccino11 }, WhichKeyFloat = { bg = cp.catppuccino14 }, - WhichKeyValue = { fg = cp.catppuccino12 }, + WhichKeyValue = { fg = cp.katppuccino11 }, } end diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index 1a068c7..a3cacb5 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -20,7 +20,7 @@ local function get_base() local cp = color_palette return { - Comment = { fg = cp.catppuccino12, style = cnf.styles.comments }, -- just comments + Comment = { fg = cp.katppuccino11, style = cnf.styles.comments }, -- just comments ColorColumn = { bg = cp.catppuccino16 }, -- used for the columns set with 'colorcolumn' Conceal = { fg = cp.black }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor = { fg = cp.katppuccino1, bg = cp.katppuccino10 }, -- character under the cursor @@ -33,7 +33,7 @@ local function get_base() ErrorMsg = { fg = cp.katppuccino5 }, -- error messages on the command line VertSplit = { fg = cp.catppuccino14 }, -- the column separating vertically split windows Folded = { fg = cp.katppuccino9, bg = cp.catppuccino13 }, -- line used for closed folds - FoldColumn = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, -- 'foldcolumn' + FoldColumn = { bg = cp.katppuccino1, fg = cp.katppuccino11 }, -- 'foldcolumn' SignColumn = { bg = cnf.transparency and cp.none or cp.katppuccino1, fg = cp.catppuccino13 }, -- column where |signs| are displayed SignColumnSB = { bg = cp.catppuccino14, fg = cp.catppuccino13 }, -- column where |signs| are displayed Substitute = { bg = cp.catppuccino13, fg = cp.katppuccino4 }, -- |:substitute| replacement text highlighting @@ -44,7 +44,7 @@ local function get_base() MsgArea = { fg = cp.katppuccino0 }, -- Area for messages and cmdline MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display' MoreMsg = { fg = cp.katppuccino9 }, -- |more-prompt| - NonText = { fg = cp.catppuccino12 }, -- '@' 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|. + NonText = { fg = cp.katppuccino11 }, -- '@' 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.katppuccino10, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- normal text NormalNC = { fg = cp.katppuccino10, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- normal text in non-current windows NormalSB = { fg = cp.fg, bg = cp.catppuccino14 }, -- normal text in non-current windows @@ -53,7 +53,7 @@ local function get_base() Pmenu = { bg = cp.catppuccino15, fg = cp.katppuccino10 }, -- Popup menu: normal item. PmenuSel = { fg = cp.katppuccino4, bg = cp.catppuccino13 }, -- Popup menu: selected item. PmenuSbar = { bg = cp.catppuccino13 }, -- Popup menu: scrollbar. - PmenuThumb = { bg = cp.catppuccino12 }, -- Popup menu: Thumb of the scrollbar. + PmenuThumb = { bg = cp.katppuccino11 }, -- Popup menu: Thumb of the scrollbar. Question = { fg = cp.katppuccino9 }, -- |hit-enter| prompt and yes/no questions QuickFixLine = { bg = cp.catppuccino13, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. Search = { bg = cp.catppuccino13, fg = cp.katppuccino4 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. @@ -73,12 +73,12 @@ local function get_base() VisualNOS = { bg = cp.catppuccino16 }, -- Visual mode selection when vim is "Not Owning the Selection". 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 + WildMenu = { bg = cp.katppuccino11 }, -- current match in 'wildmenu' completion -- These groups are not listed as default vim groups, -- but they are defacto standard group names for syntax highlighting. - -- catppuccino12ed out groups should chain up to their "preferkatppuccino5" group by + -- katppuccino11ed out groups should chain up to their "preferkatppuccino5" group by -- default, - -- Uncatppuccino12 and edit if you want more specific syntax highlighting. + -- Unkatppuccino11 and edit if you want more specific syntax highlighting. -- code itself @@ -112,7 +112,7 @@ local function get_base() -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this -- Delimiter = { }, -- character that needs attention - -- Specialcatppuccino12= { }, -- special things inside a catppuccino12 + -- Specialkatppuccino11= { }, -- special things inside a katppuccino11 -- Debug = { }, -- debugging statements Underlined = { style = "underline" }, -- (preferkatppuccino5) text that stands out, HTML links @@ -136,7 +136,7 @@ local function get_base() -- debugging debugPC = { bg = cp.catppuccino14 }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, -- used for breakpoint colors in terminal-debug + debugBreakpoint = { bg = cp.katppuccino1, fg = cp.katppuccino11 }, -- used for breakpoint colors in terminal-debug -- illuminate illuminatedWord = { bg = cp.catppuccino13 }, illuminatedCurWord = { bg = cp.catppuccino13 }, @@ -147,7 +147,7 @@ local function get_base() diffOldFile = { fg = cp.katppuccino8 }, diffNewFile = { fg = cp.katppuccino6 }, diffFile = { fg = cp.katppuccino9 }, - diffLine = { fg = cp.catppuccino12 }, + diffLine = { fg = cp.katppuccino11 }, diffIndexLine = { fg = cp.katppuccino4 }, DiffAdd = { fg = cp.katppuccino9, bg = cp.katppuccino1 }, -- diff mode: Added line |diff.txt| DiffChange = { fg = cp.katppuccino8, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| @@ -210,14 +210,14 @@ local function get_terminal() g.terminal_color_0 = cp.katppuccino0 g.terminal_color_1 = cp.catppuccino1 g.terminal_color_2 = cp.katppuccino2 - g.terminal_color_3 = cp.katppuccino2 - g.terminal_color_4 = cp.katppuccino3 - g.terminal_color_5 = cp.katppuccino4 - g.terminal_color_6 = cp.katppuccino5 - g.terminal_color_7 = cp.katppuccino6 - g.terminal_color_8 = cp.katppuccino7 - g.terminal_color_9 = cp.katppuccino8 - g.terminal_color_10 = cp.katppuccino9 + g.terminal_color_3 = cp.katppuccino3 + g.terminal_color_4 = cp.katppuccino4 + g.terminal_color_5 = cp.katppuccino5 + g.terminal_color_6 = cp.katppuccino6 + g.terminal_color_7 = cp.katppuccino7 + g.terminal_color_8 = cp.katppuccino8 + g.terminal_color_9 = cp.katppuccino9 + g.terminal_color_10 = cp.katppuccino10 end function M.apply()