fixing override logic (#226)

Ref #223
Reverting #207

2 files changed, 6 insertions, 10 deletions

diff --git a/lua/gruvbox/groups.lua b/lua/gruvbox/groups.lua
index a3f5712..d12a88b 100644
--- a/lua/gruvbox/groups.lua
+++ b/lua/gruvbox/groups.lua
@@ -787,16 +787,12 @@ M.setup = function()
   }
 
   for group, hl in pairs(config.overrides) do
-    -- When `link` is set together with other attrs, only `link` will take effect.
-    -- e.g. `{ link = "GruvboxRed", fg = colors.blue }` The final color is red.
-    -- Dereference the `link` and let user overrides it's attr.
-    local link = nil
-    if groups[group] and not vim.tbl_isempty(hl) then
-      link = groups[group]["link"]
-      groups[group]["link"] = nil
+    if groups[group] then
+      -- "link" should not mix with other configs (:h hi-link)
+      groups[group].link = nil
     end
 
-    groups[group] = vim.tbl_extend("force", groups[group] or {}, groups[link] or {}, hl)
+    groups[group] = vim.tbl_extend("force", groups[group] or {}, hl)
   end
 
   return groups
diff --git a/lua/gruvbox/palette.lua b/lua/gruvbox/palette.lua
index 178f94e..9c410a4 100644
--- a/lua/gruvbox/palette.lua
+++ b/lua/gruvbox/palette.lua
@@ -52,8 +52,8 @@ M.get_base_colors = function(bg, contrast)
   local config = require("gruvbox").config
   local p = M.colors
 
-  for k, v in pairs(config.palette_overrides) do
-    p[k] = v
+  for color, hex in pairs(config.palette_overrides) do
+    p[color] = hex
   end
 
   if bg == nil then