From 3f6bc0c808dd6ecb154cb637d5104f92305c1026 Mon Sep 17 00:00:00 2001
From: Tyler Hallada <tyler@hallada.net>
Date: Fri, 24 Mar 2023 16:47:21 -0400
Subject: Improve diff colors (#225)

These new subtler diff colors which only set the background color so
that syntax highlighting will still appear in the foreground colors.

Adds a set of "subtle" colors which can be used in either dark or light
backgrounds.
---
 lua/gruvbox/groups.lua  |  8 ++++----
 lua/gruvbox/palette.lua | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'lua')

diff --git a/lua/gruvbox/groups.lua b/lua/gruvbox/groups.lua
index 73ba4bd..a3f5712 100644
--- a/lua/gruvbox/groups.lua
+++ b/lua/gruvbox/groups.lua
@@ -148,10 +148,10 @@ M.setup = function()
     PmenuSel = { fg = colors.bg2, bg = colors.blue, bold = config.bold },
     PmenuSbar = { bg = colors.bg2 },
     PmenuThumb = { bg = colors.bg4 },
-    DiffDelete = { fg = colors.red, bg = colors.bg0, reverse = config.inverse },
-    DiffAdd = { fg = colors.green, bg = colors.bg0, reverse = config.inverse },
-    DiffChange = { fg = colors.aqua, bg = colors.bg0, reverse = config.inverse },
-    DiffText = { fg = colors.yellow, bg = colors.bg0, reverse = config.inverse },
+    DiffDelete = { bg = colors.subtle_red },
+    DiffAdd = { bg = colors.subtle_green },
+    DiffChange = { bg = colors.subtle_brown },
+    DiffText = { bg = colors.subtle_yellow },
     SpellCap = { link = "GruvboxBlueUnderline" },
     SpellBad = { link = "GruvboxRedUnderline" },
     SpellLocal = { link = "GruvboxAquaUnderline" },
diff --git a/lua/gruvbox/palette.lua b/lua/gruvbox/palette.lua
index 59e771b..178f94e 100644
--- a/lua/gruvbox/palette.lua
+++ b/lua/gruvbox/palette.lua
@@ -2,6 +2,10 @@
 local M = {}
 
 M.colors = {
+  dark_brown = "#3b3307",
+  dark_green = "#142a03",
+  dark_red = "#431313",
+  dark_yellow = "#4d520d",
   dark0_hard = "#1d2021",
   dark0 = "#282828",
   dark0_soft = "#32302f",
@@ -9,6 +13,10 @@ M.colors = {
   dark2 = "#504945",
   dark3 = "#665c54",
   dark4 = "#7c6f64",
+  light_brown = "#fdd69b",
+  light_green = "#d5e958",
+  light_red = "#ffb3a2",
+  light_yellow = "#ffdb57",
   light0_hard = "#f9f5d7",
   light0 = "#fbf1c7",
   light0_soft = "#f2e5bc",
@@ -77,6 +85,10 @@ M.get_base_colors = function(bg, contrast)
       neutral_blue = p.neutral_blue,
       neutral_purple = p.neutral_purple,
       neutral_aqua = p.neutral_aqua,
+      subtle_brown = p.dark_brown,
+      subtle_green = p.dark_green,
+      subtle_red = p.dark_red,
+      subtle_yellow = p.dark_yellow,
       gray = p.gray,
     },
     light = {
@@ -103,6 +115,10 @@ M.get_base_colors = function(bg, contrast)
       neutral_blue = p.neutral_blue,
       neutral_purple = p.neutral_purple,
       neutral_aqua = p.neutral_aqua,
+      subtle_brown = p.light_brown,
+      subtle_green = p.light_green,
+      subtle_red = p.light_red,
+      subtle_yellow = p.light_yellow,
       gray = p.gray,
     },
   }
-- 
cgit v1.2.3