From 45421bc9212cf23d5298baf477120832cb1f2ee4 Mon Sep 17 00:00:00 2001 From: siduck Date: Wed, 15 Jun 2022 07:49:23 +0530 Subject: [PATCH] https://github.com/NvChad/NvChad/issues/1209 --- lua/base46/chadlights.lua | 4 ++-- lua/base46/glassy.lua | 2 +- lua/base46/init.lua | 17 ++++------------- lua/base46/integrations/alpha.lua | 2 +- lua/base46/integrations/blankline.lua | 2 +- lua/base46/integrations/bufferline.lua | 2 +- lua/base46/integrations/cmp.lua | 4 ++-- lua/base46/integrations/defaults.lua | 4 ++-- lua/base46/integrations/devicons.lua | 2 +- lua/base46/integrations/git.lua | 4 ++-- lua/base46/integrations/lsp.lua | 2 +- lua/base46/integrations/nvimtree.lua | 2 +- lua/base46/integrations/statusline.lua | 2 +- lua/base46/integrations/syntax.lua | 2 +- lua/base46/integrations/telescope.lua | 2 +- lua/base46/integrations/treesitter.lua | 2 +- lua/base46/integrations/whichkey.lua | 2 +- lua/base46/term.lua | 2 +- 18 files changed, 25 insertions(+), 34 deletions(-) diff --git a/lua/base46/chadlights.lua b/lua/base46/chadlights.lua index 6d302d3..9149d2c 100644 --- a/lua/base46/chadlights.lua +++ b/lua/base46/chadlights.lua @@ -16,7 +16,7 @@ for _, file in ipairs(hl_files) do end -- polish theme specific highlights -local polish_hl = require("base46").get_colors "polish_hl" +local polish_hl = require("base46").get_theme_tb "polish_hl" if polish_hl then highlights = merge_tb(highlights, polish_hl) @@ -25,7 +25,7 @@ end -- override user highlights if there are any if ui.hl_override then local user_highlights = ui.hl_override - local colors = require("base46").get_colors "base_30" + local colors = require("base46").get_theme_tb "base_30" -- fg = "white" set by user becomes fg = colors["white"] -- so no need for the user to import colors diff --git a/lua/base46/glassy.lua b/lua/base46/glassy.lua index 51e4e5c..6b96c08 100644 --- a/lua/base46/glassy.lua +++ b/lua/base46/glassy.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" local M = { NvimTreeWinSeparator = { diff --git a/lua/base46/init.lua b/lua/base46/init.lua index 229d0a6..e862d00 100644 --- a/lua/base46/init.lua +++ b/lua/base46/init.lua @@ -2,9 +2,9 @@ local M = {} local g = vim.g local config = require("core.utils").load_config() -M.get_theme_tb = function(name, type) - local default_path = "base46.themes." .. name - local user_path = "custom.themes." .. name +M.get_theme_tb = function(type) + local default_path = "base46.themes." .. g.nvchad_theme + local user_path = "custom.themes." .. g.nvchad_theme local present1, default_theme = pcall(require, default_path) local present2, user_theme = pcall(require, user_path) @@ -18,11 +18,6 @@ M.get_theme_tb = function(name, type) end end -M.get_colors = function(type) - local name = g.nvchad_theme - return M.get_theme_tb(name, type) -end - M.merge_tb = function(table1, table2) return vim.tbl_deep_extend("force", table1, table2) end @@ -80,13 +75,9 @@ end M.load_theme = function() -- set bg option - local theme_type = M.get_theme_tb(g.nvchad_theme, "type") -- dark/light + local theme_type = M.get_theme_tb "type" -- dark/light vim.opt.bg = theme_type - if vim.g.theme_switcher_loaded then - M.load_all_highlights() - end - M.load_highlight "defaults" M.load_highlight "statusline" end diff --git a/lua/base46/integrations/alpha.lua b/lua/base46/integrations/alpha.lua index 9d953bd..43fa086 100644 --- a/lua/base46/integrations/alpha.lua +++ b/lua/base46/integrations/alpha.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { AlphaHeader = { fg = colors.grey_fg }, diff --git a/lua/base46/integrations/blankline.lua b/lua/base46/integrations/blankline.lua index 8972616..bc75aad 100644 --- a/lua/base46/integrations/blankline.lua +++ b/lua/base46/integrations/blankline.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { IndentBlanklineChar = { fg = colors.line }, diff --git a/lua/base46/integrations/bufferline.lua b/lua/base46/integrations/bufferline.lua index d4f3ea8..9fa0f11 100644 --- a/lua/base46/integrations/bufferline.lua +++ b/lua/base46/integrations/bufferline.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { diff --git a/lua/base46/integrations/cmp.lua b/lua/base46/integrations/cmp.lua index f7d03c9..5e9c212 100644 --- a/lua/base46/integrations/cmp.lua +++ b/lua/base46/integrations/cmp.lua @@ -1,5 +1,5 @@ -local base16 = require("base46").get_colors "base_16" -local colors = require("base46").get_colors "base_30" +local base16 = require("base46").get_theme_tb "base_16" +local colors = require("base46").get_theme_tb "base_30" return { -- nvim cmp diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua index 5857ad4..32e1839 100644 --- a/lua/base46/integrations/defaults.lua +++ b/lua/base46/integrations/defaults.lua @@ -1,5 +1,5 @@ -local colors = require("base46").get_colors "base_30" -local theme = require("base46").get_colors "base_16" +local colors = require("base46").get_theme_tb "base_30" +local theme = require("base46").get_theme_tb "base_16" return { MatchWord = { diff --git a/lua/base46/integrations/devicons.lua b/lua/base46/integrations/devicons.lua index 661e54c..7c54f9b 100644 --- a/lua/base46/integrations/devicons.lua +++ b/lua/base46/integrations/devicons.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { DevIconDefault = { fg = colors.red }, diff --git a/lua/base46/integrations/git.lua b/lua/base46/integrations/git.lua index 003b78e..45aca36 100644 --- a/lua/base46/integrations/git.lua +++ b/lua/base46/integrations/git.lua @@ -1,5 +1,5 @@ -local theme = require("base46").get_colors "base_16" -local colors = require("base46").get_colors "base_30" +local theme = require("base46").get_theme_tb "base_16" +local colors = require("base46").get_theme_tb "base_30" return { diff --git a/lua/base46/integrations/lsp.lua b/lua/base46/integrations/lsp.lua index 90d8d50..a9a269d 100644 --- a/lua/base46/integrations/lsp.lua +++ b/lua/base46/integrations/lsp.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { -- LSP References diff --git a/lua/base46/integrations/nvimtree.lua b/lua/base46/integrations/nvimtree.lua index a5ace84..93dbac0 100644 --- a/lua/base46/integrations/nvimtree.lua +++ b/lua/base46/integrations/nvimtree.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { NvimTreeEmptyFolderName = { fg = colors.folder_bg }, diff --git a/lua/base46/integrations/statusline.lua b/lua/base46/integrations/statusline.lua index 4e91bd5..878ebe6 100644 --- a/lua/base46/integrations/statusline.lua +++ b/lua/base46/integrations/statusline.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { diff --git a/lua/base46/integrations/syntax.lua b/lua/base46/integrations/syntax.lua index 356fff5..aa4a581 100644 --- a/lua/base46/integrations/syntax.lua +++ b/lua/base46/integrations/syntax.lua @@ -1,4 +1,4 @@ -local theme = require("base46").get_colors "base_16" +local theme = require("base46").get_theme_tb "base_16" -- Standard syntax highlighting diff --git a/lua/base46/integrations/telescope.lua b/lua/base46/integrations/telescope.lua index 9155cb8..3374089 100644 --- a/lua/base46/integrations/telescope.lua +++ b/lua/base46/integrations/telescope.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua index 235df20..1f79853 100644 --- a/lua/base46/integrations/treesitter.lua +++ b/lua/base46/integrations/treesitter.lua @@ -1,4 +1,4 @@ -local theme = require("base46").get_colors "base_16" +local theme = require("base46").get_theme_tb "base_16" return { TSAnnotation = { diff --git a/lua/base46/integrations/whichkey.lua b/lua/base46/integrations/whichkey.lua index a2e5752..8aadff2 100644 --- a/lua/base46/integrations/whichkey.lua +++ b/lua/base46/integrations/whichkey.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_30" +local colors = require("base46").get_theme_tb "base_30" return { WhichKey = { fg = colors.blue }, diff --git a/lua/base46/term.lua b/lua/base46/term.lua index 5d9060c..0addd6f 100644 --- a/lua/base46/term.lua +++ b/lua/base46/term.lua @@ -1,4 +1,4 @@ -local colors = require("base46").get_colors "base_16" +local colors = require("base46").get_theme_tb "base_16" vim.g.terminal_color_0 = colors.base02 vim.g.terminal_color_1 = colors.base08