From 7402190a9b672426f636fc05fd96d49e0411c6f0 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Fri, 29 Oct 2021 20:48:44 -0500 Subject: [PATCH] fix: sidebars and added new colors --- lua/catppuccino/core/color_palette.lua | 5 ++++- lua/catppuccino/core/integrations/lsp_trouble.lua | 2 +- lua/catppuccino/core/integrations/nvimtree.lua | 6 +++--- lua/catppuccino/core/integrations/which_key.lua | 2 +- lua/catppuccino/core/mapper.lua | 10 +++++----- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index 45b0821..58871f8 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -12,7 +12,10 @@ local color_palette = { catppuccino10 = "#7EA1C8", -- Cerulean Frost catppuccino11 = "#A7B6DC", -- Wild Blue Yonder catppuccino12 = "#63718B", -- Queen Blue - catppuccino + catppuccino13 = "#3e4058", -- Independence + catppuccino14 = "#110E17", + catppuccino15 = "#1B1927", + catppuccino16 = "#201C2B", } return color_palette diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccino/core/integrations/lsp_trouble.lua index 560593f..a012f36 100644 --- a/lua/catppuccino/core/integrations/lsp_trouble.lua +++ b/lua/catppuccino/core/integrations/lsp_trouble.lua @@ -4,7 +4,7 @@ function M.get(cp) return { LspTroubleText = { fg = cp.catppuccino11_alt }, LspTroubleCount = { fg = cp.catppuccino5, bg = cp.catppuccino13 }, - LspTroubleNormal = { fg = cp.catppuccino11_sidebar, bg = cp.catppuccino2_sidebar }, + LspTroubleNormal = { fg = cp.catppuccino11, bg = cp.catppuccino14 }, } end diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index bb8f67b..6f5a8c1 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) local config = require("catppuccino.config").options - local root_dir_color = cp.catppuccino2_sidebar + local root_dir_color = cp.catppuccino5 if config.integrations.nvimtree.show_root then root_dir_color = cp.catppuccino10 @@ -12,7 +12,7 @@ function M.get(cp) return { NvimTreeFolderName = { fg = cp.catppuccino10 }, NvimTreeFolderIcon = { fg = cp.catppuccino10 }, - NvimTreeNormal = { fg = cp.catppuccino11, bg = cp.catppuccino2_sidebar }, + NvimTreeNormal = { fg = cp.catppuccino11, bg = cp.catppuccino14 }, NvimTreeOpenedFolderName = { fg = cp.catppuccino10 }, NvimTreeEmptyFolderName = { fg = cp.catppuccino10 }, NvimTreeIndentMarker = { fg = cp.catppuccino12 }, @@ -24,7 +24,7 @@ function M.get(cp) NvimTreeGitNew = { fg = cp.diff.add }, NvimTreeGitDeleted = { fg = cp.diff.delete }, NvimTreeSpecialFile = { fg = cp.catppuccino3 }, - NvimTreeImageFile = { fg = cp.catppuccino11_sidebar }, + NvimTreeImageFile = { fg = cp.catppuccino11 }, NvimTreeOpenedFile = { fg = cp.catppuccino5 }, } end diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index ffaa4a8..34b186e 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -7,7 +7,7 @@ function M.get(cp) WhichKeyDesc = { fg = cp.catppuccino5 }, WhichKeySeperator = { fg = cp.catppuccino12 }, WhichKeySeparator = { fg = cp.catppuccino12 }, - WhichKeyFloat = { bg = cp.catppuccino2_sidebar }, + WhichKeyFloat = { bg = cp.catppuccino14 }, WhichKeyValue = { fg = cp.catppuccino12 }, } end diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index bb973a6..21009e5 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -36,10 +36,10 @@ local function get_base() Folded = { fg = cp.catppuccino10, bg = cp.catppuccino13 }, -- line used for closed folds FoldColumn = { bg = cp.catppuccino2, fg = cp.catppuccino12 }, -- 'foldcolumn' SignColumn = { bg = cnf.transparency and cp.none or cp.catppuccino2, fg = cp.catppuccino13 }, -- column where |signs| are displayed - SignColumnSB = { bg = cp.catppuccino2_sidebar, fg = cp.catppuccino13 }, -- column where |signs| are displayed + SignColumnSB = { bg = cp.catppuccino14, fg = cp.catppuccino13 }, -- column where |signs| are displayed Substitute = { bg = cp.catppuccino6, fg = cp.black }, -- |:substitute| replacement text highlighting LineNr = { fg = cp.catppuccino13 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. - CursorLineNr = { fg = cp.catppuccino11_alt }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. + CursorLineNr = { fg = cp.catppuccino16 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.catppuccino7, style = "bold" }, -- The character under the cursor or just before it, if it is a paicatppuccino6 bracket, and its match. |pi_paren.txt| ModeMsg = { fg = cp.catppuccino11_alt, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea = { fg = cp.catppuccino0 }, -- Area for messages and cmdline @@ -48,7 +48,7 @@ local function get_base() 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|. Normal = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text NormalNC = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text in non-current windows - NormalSB = { fg = cp.catppuccino11_sidebar, bg = cp.catppuccino2_sidebar }, -- normal text in non-current windows + NormalSB = { fg = cp.fg, bg = cp.catppuccino14 }, -- normal text in non-current windows NormalFloat = { fg = cp.catppuccino11, bg = cp.catppuccino2_float }, -- Normal text in floating windows. FloatBorder = { fg = cp.border_highlight }, Pmenu = { bg = cp.catppuccino2_popup, fg = cp.catppuccino11 }, -- Popup menu: normal item. @@ -64,7 +64,7 @@ local function get_base() SpellCap = { sp = cp.warning, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal = { sp = cp.info, 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.hint, 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_sidebar, bg = cp.catppuccino2_statusline }, -- status line of current window + StatusLine = { fg = cp.catppuccino11, bg = cp.catppuccino15 }, -- status line of current window StatusLineNC = { fg = cp.catppuccino13, bg = cp.catppuccino2_statusline }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. TabLine = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino13 }, -- tab pages line, not active tab page label TabLineFill = { bg = cp.black }, -- tab pages line, where there are no labels @@ -136,7 +136,7 @@ local function get_base() -- mkdLink = { fg = cp.catppuccino10, style = "underline" }, -- debugging - debugPC = { bg = cp.catppuccino2_sidebar }, -- used for highlighting the current line in terminal-debug + debugPC = { bg = cp.catppuccino14 }, -- used for highlighting the current line in terminal-debug debugBreakpoint = { bg = util.darken(cp.info, 0.1), fg = cp.info }, -- used for breakpoint colors in terminal-debug -- illuminate illuminatedWord = { bg = cp.catppuccino13 },