mirror of
https://github.com/gabehf/base46.git
synced 2026-03-13 09:20:31 -07:00
update nvchad load_config result path (#251)
This commit is contained in:
parent
c1e6adf348
commit
34a916c134
8 changed files with 12 additions and 8 deletions
|
|
@ -1,8 +1,12 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
local g = vim.g
|
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")
|
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)
|
M.get_theme_tb = function(type)
|
||||||
local default_path = "base46.themes." .. g.nvchad_theme
|
local default_path = "base46.themes." .. g.nvchad_theme
|
||||||
local user_path = "custom.themes." .. g.nvchad_theme
|
local user_path = "custom.themes." .. g.nvchad_theme
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ local item_kinds = {
|
||||||
CmpItemKindTabNine = {fg = colors.baby_pink },
|
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!
|
-- custom highlights per style!
|
||||||
local styles = {
|
local styles = {
|
||||||
|
|
|
||||||
|
|
@ -248,6 +248,6 @@ local merge_tb = require("base46").merge_tb
|
||||||
defaults = merge_tb(defaults, require("base46").load_highlight "statusline")
|
defaults = merge_tb(defaults, require("base46").load_highlight "statusline")
|
||||||
|
|
||||||
local hexify_ColorStrs = require("base46").turn_str_to_color
|
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))
|
return merge_tb(defaults, hexify_ColorStrs(user_new_highlights))
|
||||||
|
|
|
||||||
|
|
@ -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
|
if cheatsheet_theme == "grid" then
|
||||||
M.NvChAsciiHeader = {
|
M.NvChAsciiHeader = {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ local generate_color = require("base46.colors").change_hex_lightness
|
||||||
local merge_tb = vim.tbl_deep_extend
|
local merge_tb = vim.tbl_deep_extend
|
||||||
|
|
||||||
-- change color values according to statusilne themes
|
-- 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
|
local statusline_theme = config.statusline.theme
|
||||||
|
|
||||||
if statusline_theme == "custom" then
|
if statusline_theme == "custom" then
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ local syntax = {
|
||||||
}
|
}
|
||||||
|
|
||||||
local merge_tb = require("base46").merge_tb
|
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
|
if vim.version().minor >= 9 and lsp_semantic_tokens then
|
||||||
local semantic_hls = {
|
local semantic_hls = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
local colors = require("base46").get_theme_tb "base_30"
|
local colors = require("base46").get_theme_tb "base_30"
|
||||||
|
|
||||||
local config = require("core.utils").load_config().ui
|
local config = require("nvconfig").ui
|
||||||
|
|
||||||
local highlights = {
|
local highlights = {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
local colors = require("base46").get_theme_tb "base_30"
|
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 = {
|
local hlgroups = {
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue