gabehf/base46
1
0
Fork 0
mirror of https://github.com/gabehf/base46.git synced 2026-03-14 09:46:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge statusline highlights & opt_bg into defaults file

Browse source
This commit is contained in:
siduck 2023-01-29 18:18:34 +05:30
parent 31965d2dac
commit add8e21a0c
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lua/base46/init.lua
View file

@ -104,8 +104,11 @@ M.saveStr_to_cache = function(filename, tb)
-- Thanks to https://github.com/EdenEast/nightfox.nvim -- Thanks to https://github.com/EdenEast/nightfox.nvim
-- It helped me understand string.dump stuff -- It helped me understand string.dump stuff
local bg_opt = "vim.opt.bg='" .. M.get_theme_tb "type" .. "'"
local defaults_cond = filename == "defaults" and bg_opt or ""
local cache_path = vim.fn.stdpath "cache" .. "/nvchad/base46/" local cache_path = vim.fn.stdpath "cache" .. "/nvchad/base46/"
local lines = 'require("base46").compiled = string.dump(function()' .. M.table_to_str(tb) .. "end)" local lines = 'require("base46").compiled = string.dump(function()' .. defaults_cond .. M.table_to_str(tb) .. "end)"
local file = io.open(cache_path .. filename, "wb") local file = io.open(cache_path .. filename, "wb")
loadstring(lines, "=")() loadstring(lines, "=")()
@ -121,22 +124,11 @@ M.compile = function()
local hl_files = vim.g.base46_custom_path or vim.fn.stdpath "data" .. "/lazy/base46/lua/base46/integrations" local hl_files = vim.g.base46_custom_path or vim.fn.stdpath "data" .. "/lazy/base46/lua/base46/integrations"
for _, file in ipairs(vim.fn.readdir(hl_files)) do for _, file in ipairs(vim.fn.readdir(hl_files)) do
local filename = vim.fn.fnamemodify(file, ":r") -- skip caching statusline file as its done in defaults file
local integration = M.load_highlight(filename) if file ~= "statusline" then
local filename = vim.fn.fnamemodify(file, ":r")
-- merge new hl groups added by users M.saveStr_to_cache(filename, M.load_highlight(filename))
if filename == "defaults" then
integration = M.merge_tb(integration, (M.turn_str_to_color(config.ui.hl_add)))
end end
M.saveStr_to_cache(filename, integration)
end
local bg_file = io.open(vim.fn.stdpath "cache" .. "/nvchad/base46/bg", "wb")
if bg_file then
bg_file:write("vim.opt.bg='" .. M.get_theme_tb "type".."'")
bg_file:close()
end end
end end

10
lua/base46/integrations/defaults.lua
View file

@ -3,7 +3,7 @@ local theme = require("base46").get_theme_tb "base_16"
local generate_color = require("base46.colors").change_hex_lightness local generate_color = require("base46.colors").change_hex_lightness
return { local defaults = {
MatchWord = { MatchWord = {
bg = colors.grey, bg = colors.grey,
fg = colors.white, fg = colors.white,
@ -250,3 +250,11 @@ return {
LazyReasonImport = { fg = colors.white }, LazyReasonImport = { fg = colors.white },
LazyProgressDone = { fg = colors.green }, LazyProgressDone = { fg = colors.green },
} }
-- merge statusilne & hl_add tables!
local merge_tb = require("base46").merge_tb
defaults = merge_tb(defaults, require("base46").load_highlight "statusline")
defaults = merge_tb(defaults, require("core.utils").load_config().ui.hl_add)
return defaults