fix hl_override to override properly | https://github.com/NvChad/NvChad/issues/1233 and #87

lua/base46/init.lua

@@ -85,10 +85,9 @@ M.extend_default_hl = function(highlights)
 
    -- transparency
    if vim.g.transparency then
-      -- highlights_tb = M.merge_tb(highlights_tb,)
       for key, value in pairs(glassy) do
          if highlights[key] then
-            highlights[key] = value
+            highlights[key] = M.merge_tb(highlights[key], value)
          end
       end
    end
@@ -97,7 +96,7 @@ M.extend_default_hl = function(highlights)
 
    for key, value in pairs(overriden_hl) do
       if highlights[key] then
-         highlights[key] = value
+         highlights[key] = M.merge_tb(highlights[key], value)
       end
    end
 end
@@ -106,8 +105,6 @@ M.load_highlight = function(group)
    if type(group) == "string" then
       group = require("base46.integrations." .. group)
       M.extend_default_hl(group)
-   else
-      group = group
    end
 
    for hl, col in pairs(group) do

lua/base46/integrations/blankline.lua

@@ -3,4 +3,6 @@ local colors = require("base46").get_theme_tb "base_30"
 return {
    IndentBlanklineChar = { fg = colors.line },
    IndentBlanklineSpaceChar = { fg = colors.line },
+   IndentBlanklineContextChar = { fg = colors.grey },
+   IndentBlanklineContextStart = { bg = colors.one_bg2 },
 }

lua/base46/integrations/defaults.lua

@@ -27,7 +27,9 @@ return {
    WinSeparator = { fg = colors.line },
 
    -- packer
-   packerPackageName = { fg = colors.red },
+   PackerPackageName = { fg = colors.red },
+   PackerSuccess = { fg = colors.green },
+   PackeProgress = { fg = colors.blue },
 
    Normal = {
       fg = theme.base05,

lua/base46/integrations/nvimtree.lua

@@ -29,4 +29,14 @@ return {
    NvimTreeGitNew = {
       fg = colors.yellow,
    },
+
+   NvimTreeSpecialFile = {
+      fg = colors.yellow,
+      bold = true,
+   },
+
+   NvimTreeRootFolder = {
+      fg = colors.red,
+      bold = true,
+   },
 }