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

Merge pull request #65 from ahhshm/global-utils

Browse source 
refactor: utils are in the global scope now
This commit is contained in:
siduck 2022-05-10 20:15:15 +05:30 • committed by GitHub
commit ef1ae11a98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lua/base46.lua
View file

@ -6,7 +6,7 @@ M.get_colors = function(type)
if vim.g.nvchad_theme then
name = vim.g.nvchad_theme
else
name = require("core.utils").load_config().ui.theme
name = nvchad.load_config().ui.theme
vim.g.nvchad_theme = name
end
@ -52,7 +52,7 @@ M.load_theme = function()
end
M.override_theme = function(default_theme, theme_name)
local changed_themes = require("core.utils").load_config().ui.changed_themes
local changed_themes = nvchad.load_config().ui.changed_themes
if changed_themes[theme_name] then
return M.merge_tb(default_theme, changed_themes[theme_name])
@ -62,7 +62,7 @@ M.override_theme = function(default_theme, theme_name)
end
M.toggle_theme = function()
local themes = require("core.utils").load_config().ui.theme_toggle
local themes = nvchad.load_config().ui.theme_toggle
local theme1 = themes[1]
local theme2 = themes[2]

2
lua/chadlights.lua
View file

@ -20,7 +20,7 @@ end
require "term_hl"
-- override user highlights if there are any
local user_highlights = require("core.utils").load_config().ui.hl_override
local user_highlights = nvchad.load_config().ui.hl_override
highlights = merge_tb(highlights, user_highlights)
-- finally set all highlights :D

2
lua/integrations/nvchad.lua
View file

@ -1,5 +1,5 @@
local colors = require("base46").get_colors "base_30"
local ui = require("core.utils").load_config().ui
local ui = nvchad.load_config().ui
local black = colors.black
local black2 = colors.black2