From 34a916c134625cd34effdd855e6de9212441c33b Mon Sep 17 00:00:00 2001
From: Sidhanth Rathod <siduck@tutanota.com>
Date: Mon, 16 Oct 2023 07:27:13 +0530
Subject: [PATCH] update nvchad load_config result path (#251)

---
 lua/base46/init.lua                      | 6 +++++-
 lua/base46/integrations/cmp.lua          | 2 +-
 lua/base46/integrations/defaults.lua     | 2 +-
 lua/base46/integrations/nvcheatsheet.lua | 2 +-
 lua/base46/integrations/statusline.lua   | 2 +-
 lua/base46/integrations/syntax.lua       | 2 +-
 lua/base46/integrations/tbline.lua       | 2 +-
 lua/base46/integrations/telescope.lua    | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lua/base46/init.lua b/lua/base46/init.lua
index f179293..846406f 100644
--- a/lua/base46/init.lua
+++ b/lua/base46/init.lua
@@ -1,8 +1,12 @@
 local M = {}
 local g = vim.g
-local config = require("core.utils").load_config()
+local config = require "nvconfig"
 local base46_path = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h")
 
+if not vim.g.nvchad_theme then
+  vim.g.nvchad_theme = config.ui.theme
+end
+
 M.get_theme_tb = function(type)
   local default_path = "base46.themes." .. g.nvchad_theme
   local user_path = "custom.themes." .. g.nvchad_theme
diff --git a/lua/base46/integrations/cmp.lua b/lua/base46/integrations/cmp.lua
index 2ec1b8a..72a6d47 100644
--- a/lua/base46/integrations/cmp.lua
+++ b/lua/base46/integrations/cmp.lua
@@ -45,7 +45,7 @@ local item_kinds = {
   CmpItemKindTabNine = {fg = colors.baby_pink },
 }
 
-local cmp_ui = require("core.utils").load_config().ui.cmp
+local cmp_ui = require("nvconfig").ui.cmp
 
 -- custom highlights per style!
 local styles = {
diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua
index 2c893d1..1904f39 100644
--- a/lua/base46/integrations/defaults.lua
+++ b/lua/base46/integrations/defaults.lua
@@ -248,6 +248,6 @@ local merge_tb = require("base46").merge_tb
 defaults = merge_tb(defaults, require("base46").load_highlight "statusline")
 
 local hexify_ColorStrs = require("base46").turn_str_to_color
-local user_new_highlights = require("core.utils").load_config().ui.hl_add
+local user_new_highlights = require("nvconfig").ui.hl_add
 
 return merge_tb(defaults, hexify_ColorStrs(user_new_highlights))
diff --git a/lua/base46/integrations/nvcheatsheet.lua b/lua/base46/integrations/nvcheatsheet.lua
index 88811a8..ae462a6 100644
--- a/lua/base46/integrations/nvcheatsheet.lua
+++ b/lua/base46/integrations/nvcheatsheet.lua
@@ -17,7 +17,7 @@ local M = {
   },
 }
 
-local cheatsheet_theme = require("core.utils").load_config().ui.cheatsheet.theme
+local cheatsheet_theme = require("nvconfig").ui.cheatsheet.theme
 
 if cheatsheet_theme == "grid" then
   M.NvChAsciiHeader = {
diff --git a/lua/base46/integrations/statusline.lua b/lua/base46/integrations/statusline.lua
index 48aa415..7fa8c09 100644
--- a/lua/base46/integrations/statusline.lua
+++ b/lua/base46/integrations/statusline.lua
@@ -5,7 +5,7 @@ local generate_color = require("base46.colors").change_hex_lightness
 local merge_tb = vim.tbl_deep_extend
 
 -- change color values according to statusilne themes
-local config = require("core.utils").load_config().ui
+local config = require("nvconfig").ui
 local statusline_theme = config.statusline.theme
 
 if statusline_theme == "custom" then
diff --git a/lua/base46/integrations/syntax.lua b/lua/base46/integrations/syntax.lua
index bcd5a8f..dbcb79a 100644
--- a/lua/base46/integrations/syntax.lua
+++ b/lua/base46/integrations/syntax.lua
@@ -116,7 +116,7 @@ local syntax = {
 }
 
 local merge_tb = require("base46").merge_tb
-local lsp_semantic_tokens = require("core.utils").load_config().ui.lsp_semantic_tokens
+local lsp_semantic_tokens = require("nvconfig").ui.lsp_semantic_tokens
 
 if vim.version().minor >= 9 and lsp_semantic_tokens then
   local semantic_hls = {
diff --git a/lua/base46/integrations/tbline.lua b/lua/base46/integrations/tbline.lua
index a182522..2c67463 100644
--- a/lua/base46/integrations/tbline.lua
+++ b/lua/base46/integrations/tbline.lua
@@ -1,6 +1,6 @@
 local colors = require("base46").get_theme_tb "base_30"
 
-local config = require("core.utils").load_config().ui
+local config = require("nvconfig").ui
 
 local highlights = {
 
diff --git a/lua/base46/integrations/telescope.lua b/lua/base46/integrations/telescope.lua
index 81a23c7..1c9a3a1 100644
--- a/lua/base46/integrations/telescope.lua
+++ b/lua/base46/integrations/telescope.lua
@@ -1,6 +1,6 @@
 local colors = require("base46").get_theme_tb "base_30"
 
-local telescope_style = require("core.utils").load_config().ui.telescope.style
+local telescope_style = require("nvconfig").ui.telescope.style
 
 local hlgroups = {