From c437146d5af4dbffc305ec7cdfe011991f596268 Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Fri, 20 Aug 2021 20:26:08 -0500
Subject: [PATCH] fix: better highlights for gitsigns and better org

---
 lua/catppuccino/color_schemes/catppuccino.lua  | 17 +++--------------
 lua/catppuccino/core/integrations/gitsigns.lua |  6 +++---
 lua/catppuccino/core/mapper.lua                | 10 ++++++----
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/lua/catppuccino/color_schemes/catppuccino.lua b/lua/catppuccino/color_schemes/catppuccino.lua
index f880836..331d6b0 100644
--- a/lua/catppuccino/color_schemes/catppuccino.lua
+++ b/lua/catppuccino/color_schemes/catppuccino.lua
@@ -34,11 +34,6 @@ local colors = {
         delete = "#e06c75",
         conflict = "#FFE37E"
     },
-    gitSigns = {
-        add = "#164846",
-        change = "#394b70",
-        delete = "#823c41"
-    }
 }
 
 util.bg = colors.bg
@@ -48,19 +43,13 @@ colors.bg_highlight = util.brighten(colors.bg, 0.05)
 
 colors.fg_alt = util.darken(colors.fg, 0.80, "#000000")
 
-colors.diff = {
-    add = util.darken(colors.green, 0.15),
+colors.diff = { -- also used for gitsigns
+    add = util.darken(colors.blue, 0.15),
     delete = util.darken(colors.red, 0.15),
-    change = util.darken(colors.blue, 0.15),
+    change = util.darken(colors.orange, 0.15),
     text = colors.blue
 }
 
-colors.gitSigns = {
-    add = util.brighten(colors.gitSigns.add, 0.2),
-    change = util.brighten(colors.gitSigns.change, 0.2),
-    delete = util.brighten(colors.gitSigns.delete, 0.2)
-}
-
 colors.git.ignore = colors.black
 colors.black = util.darken(colors.bg, 0.8, "#000000")
 colors.border_highlight = colors.blue
diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua
index 8f58d30..5af8496 100644
--- a/lua/catppuccino/core/integrations/gitsigns.lua
+++ b/lua/catppuccino/core/integrations/gitsigns.lua
@@ -1,5 +1,5 @@
 return {
-    GitSignsAdd = {fg = cpt.gitSigns.add}, -- diff mode: Added line |diff.txt|
-    GitSignsChange = {fg = cpt.gitSigns.change}, -- diff mode: Changed line |diff.txt|
-    GitSignsDelete = {fg = cpt.gitSigns.delete} -- diff mode: Deleted line |diff.txt|
+    GitSignsAdd = {fg = cpt.diff.add, bg = cpt.bg}, -- diff mode: Added line |diff.txt|
+    GitSignsChange = {fg = cpt.diff.change, bg = cpt.bg}, -- diff mode: Changed line |diff.txt|
+    GitSignsDelete = {fg = cpt.diff.delete, bg = cpt.bg} -- diff mode: Deleted line |diff.txt|
 }
diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua
index a2c6e92..e275a6a 100644
--- a/lua/catppuccino/core/mapper.lua
+++ b/lua/catppuccino/core/mapper.lua
@@ -13,10 +13,6 @@ local function get_base()
         CursorColumn = {bg = cpt.bg_highlight}, -- Screen-column at the cursor, when 'cursorcolumn' is secpt.
         CursorLine = {bg = cpt.bg_highlight}, -- Screen-line at the cursor, when 'cursorline' is secpt.  Low-priority if foreground (ctermfg OR guifg) is not secpt.
         Directory = {fg = cpt.blue}, -- directory names (and other special names in listings)
-        DiffAdd = {bg = cpt.diff.add}, -- diff mode: Added line |diff.txt|
-        DiffChange = {bg = cpt.diff.change}, -- diff mode: Changed line |diff.txt|
-        DiffDelete = {bg = cpt.diff.delete}, -- diff mode: Deleted line |diff.txt|
-        DiffText = {bg = cpt.diff.text}, -- diff mode: Changed text within a changed line |diff.txt|
         EndOfBuffer = {fg = cpt.bg}, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
         ErrorMsg = {fg = cpt.error}, -- error messages on the command line
         VertSplit = {fg = cpt.border}, -- the column separating vertically split windows
@@ -140,6 +136,12 @@ local function get_base()
         diffLine = {fg = cpt.comment},
         diffIndexLine = {fg = cpt.magenta},
 
+		-- git diff
+        DiffAdd = {fg = cpt.diff.add, bg = cpt.bg}, -- diff mode: Added line |diff.txt|
+        DiffChange = {fg = cpt.diff.change, bg = cpt.bg}, -- diff mode: Changed line |diff.txt|
+        DiffDelete = {fg  = cpt.diff.delete, bg = cpt.bg}, -- diff mode: Deleted line |diff.txt|
+        DiffText = {fg = cpt.diff.text, bg = cpt.bg}, -- diff mode: Changed text within a changed line |diff.txt|
+
         -- NeoVim
         healthError = {fg = cpt.error},
         healthSuccess = {fg = cpt.green_br},