From 66e057e65d3d4583c1affcdafdedb972e4deb822 Mon Sep 17 00:00:00 2001 From: siduck Date: Sat, 18 Jun 2022 09:54:02 +0530 Subject: [PATCH 1/3] fix hl_override to override properly | https://github.com/NvChad/NvChad/issues/1233 and #87 --- lua/base46/init.lua | 7 ++----- lua/base46/integrations/blankline.lua | 2 ++ lua/base46/integrations/defaults.lua | 4 +++- lua/base46/integrations/nvimtree.lua | 10 ++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lua/base46/init.lua b/lua/base46/init.lua index 08a4c81..c4fd6d8 100644 --- a/lua/base46/init.lua +++ b/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 diff --git a/lua/base46/integrations/blankline.lua b/lua/base46/integrations/blankline.lua index bc75aad..13b1608 100644 --- a/lua/base46/integrations/blankline.lua +++ b/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 }, } diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua index 32e1839..6698278 100644 --- a/lua/base46/integrations/defaults.lua +++ b/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, diff --git a/lua/base46/integrations/nvimtree.lua b/lua/base46/integrations/nvimtree.lua index 93dbac0..c7f46f8 100644 --- a/lua/base46/integrations/nvimtree.lua +++ b/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, + }, } From 33f938551249f61d35b53022a4885f6f17dcf4c6 Mon Sep 17 00:00:00 2001 From: siduck Date: Sat, 18 Jun 2022 12:21:02 +0530 Subject: [PATCH 2/3] avoid using plenary for simple tasks --- lua/base46/chadlights.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lua/base46/chadlights.lua b/lua/base46/chadlights.lua index a09e32d..651d83f 100644 --- a/lua/base46/chadlights.lua +++ b/lua/base46/chadlights.lua @@ -2,16 +2,12 @@ local merge_tb = require("base46").merge_tb local ui = require("core.utils").load_config().ui local highlights = {} -local hl_dir = vim.fn.stdpath "data" .. "/site/pack/packer/opt/base46/lua/base46/integrations" -- push hl_dir file names to table -local hl_files = require("plenary.scandir").scan_dir(hl_dir, {}) +local hl_files = vim.fn.stdpath "data" .. "/site/pack/packer/opt/base46/lua/base46/integrations" -for _, file in ipairs(hl_files) do - local a = vim.fn.fnamemodify(file, ":t") - a = vim.fn.fnamemodify(a, ":r") - - local integration = require("base46.integrations." .. a) +for _, file in ipairs(vim.fn.readdir(hl_files)) do + local integration = require("base46.integrations." .. vim.fn.fnamemodify(file, ":r")) highlights = merge_tb(highlights, integration) end From 65d2e690a4b4641e9aef5befaf35a89f5c922406 Mon Sep 17 00:00:00 2001 From: siduck Date: Sat, 18 Jun 2022 16:22:38 +0530 Subject: [PATCH 3/3] update dir paths as base46 isnt an opt plugin anymore --- lua/base46/chadlights.lua | 2 +- lua/base46/init.lua | 9 +++++---- lua/base46/integrations/defaults.lua | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lua/base46/chadlights.lua b/lua/base46/chadlights.lua index 651d83f..567ed48 100644 --- a/lua/base46/chadlights.lua +++ b/lua/base46/chadlights.lua @@ -4,7 +4,7 @@ local ui = require("core.utils").load_config().ui local highlights = {} -- push hl_dir file names to table -local hl_files = vim.fn.stdpath "data" .. "/site/pack/packer/opt/base46/lua/base46/integrations" +local hl_files = vim.fn.stdpath "data" .. "/site/pack/packer/start/base46/lua/base46/integrations" for _, file in ipairs(vim.fn.readdir(hl_files)) do local integration = require("base46.integrations." .. vim.fn.fnamemodify(file, ":r")) diff --git a/lua/base46/init.lua b/lua/base46/init.lua index c4fd6d8..a1d8d46 100644 --- a/lua/base46/init.lua +++ b/lua/base46/init.lua @@ -37,11 +37,14 @@ M.clear_highlights = function(hl_group) end M.load_all_highlights = function() + vim.opt.bg = require("base46").get_theme_tb "type" -- dark/light + -- reload highlights for theme switcher local reload = require("plenary.reload").reload_module + local clear_hl = require("base46").clear_highlights - M.clear_highlights "BufferLine" - M.clear_highlights "TS" + clear_hl "BufferLine" + clear_hl "TS" reload "base46.integrations" reload "base46.chadlights" @@ -174,12 +177,10 @@ M.toggle_transparency = function() if g.transparency then g.transparency = false - M.load_all_highlights() save_chadrc_data() else g.transparency = true - M.load_all_highlights() save_chadrc_data() end diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua index 6698278..18b079f 100644 --- a/lua/base46/integrations/defaults.lua +++ b/lua/base46/integrations/defaults.lua @@ -30,6 +30,8 @@ return { PackerPackageName = { fg = colors.red }, PackerSuccess = { fg = colors.green }, PackeProgress = { fg = colors.blue }, + PackerOutput = { fg = colors.red }, + PackerStatus = { fg = colors.blue }, Normal = { fg = theme.base05,