From a693442c0bcf49b1fc4ec691942d78b12760b631 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Fri, 29 Oct 2021 22:15:22 -0500 Subject: [PATCH] fix: diffs --- lua/catppuccino/core/integrations/gitgutter.lua | 6 +++--- lua/catppuccino/core/integrations/gitsigns.lua | 6 +++--- lua/catppuccino/core/integrations/neogit.lua | 4 ++-- lua/catppuccino/core/integrations/nvimtree.lua | 6 +++--- lua/catppuccino/core/mapper.lua | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/catppuccino/core/integrations/gitgutter.lua index 401d5d7..8771107 100644 --- a/lua/catppuccino/core/integrations/gitgutter.lua +++ b/lua/catppuccino/core/integrations/gitgutter.lua @@ -2,9 +2,9 @@ local M = {} function M.get(cp) return { - GitGutterAdd = { fg = cp.diff.add }, - GitGutterChange = { fg = cp.diff.change }, - GitGutterDelete = { fg = cp.diff.delete }, + GitGutterAdd = { fg = cp.catppuccino10 }, + GitGutterChange = { fg = cp.catppuccino9 }, + GitGutterDelete = { fg = cp.catppuccino6 }, } end return M diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua index cd31431..e72c85e 100644 --- a/lua/catppuccino/core/integrations/gitsigns.lua +++ b/lua/catppuccino/core/integrations/gitsigns.lua @@ -2,9 +2,9 @@ local M = {} function M.get(cp) return { - GitSignsAdd = { fg = cp.diff.add, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = cp.diff.change, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = cp.diff.remove, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| + GitSignsAdd = { fg = cp.catppuccino10, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = cp.catppuccino9, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = cp.catppuccino6, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index ef8235c..5520faa 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -8,8 +8,8 @@ function M.get(cp) NeogitHunkHeader = { bg = cp.catppuccino10, fg = cp.catppuccino11 }, NeogitHunkHeaderHighlight = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, NeogitDiffContextHighlight = { bg = util.darken(cp.catppuccino13, 0.5), fg = cp.catppuccino0 }, - NeogitDiffDeleteHighlight = { fg = cp.diff.delete, bg = cp.catppuccino2 }, - NeogitDiffAddHighlight = { fg = cp.diff.add, bg = cp.catppuccino2 }, + NeogitDiffDeleteHighlight = { fg = cp.catppuccino6, bg = cp.catppuccino2 }, + NeogitDiffAddHighlight = { fg = cp.catppuccino10, bg = cp.catppuccino2 }, } end diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 6f5a8c1..7a71dac 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -20,9 +20,9 @@ function M.get(cp) NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeSymlink = { fg = cp.catppuccino5 }, NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black }, - NvimTreeGitDirty = { fg = cp.diff.change }, - NvimTreeGitNew = { fg = cp.diff.add }, - NvimTreeGitDeleted = { fg = cp.diff.delete }, + NvimTreeGitDirty = { fg = cp.catppuccino9 }, + NvimTreeGitNew = { fg = cp.catppuccino10 }, + NvimTreeGitDeleted = { fg = cp.catppuccino6 }, NvimTreeSpecialFile = { fg = cp.catppuccino3 }, NvimTreeImageFile = { fg = cp.catppuccino11 }, NvimTreeOpenedFile = { fg = cp.catppuccino5 }, diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index a3d5201..bfa31a4 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -142,18 +142,18 @@ local function get_base() illuminatedWord = { bg = cp.catppuccino13 }, illuminatedCurWord = { bg = cp.catppuccino13 }, -- diff - diffAdded = { fg = cp.diff.add }, - diffRemoved = { fg = cp.diff.delete }, - diffChanged = { fg = cp.diff.change }, + diffAdded = { fg = cp.catppuccino10 }, + diffRemoved = { fg = cp.catppuccino6 }, + diffChanged = { fg = cp.catppuccino9 }, diffOldFile = { fg = cp.catppuccino9 }, diffNewFile = { fg = cp.catppuccino7 }, diffFile = { fg = cp.catppuccino10 }, diffLine = { fg = cp.catppuccino12 }, diffIndexLine = { fg = cp.catppuccino5 }, - DiffAdd = { fg = cp.diff.add, bg = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = cp.diff.change, bg = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = cp.diff.delete, bg = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = cp.diff.text, bg = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd = { fg = cp.catppuccino10, bg = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = cp.catppuccino9, bg = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = cp.catppuccino6, bg = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = cp.catppuccino10, bg = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.error }, healthSuccess = { fg = cp.catppuccino8 },