Breaking Change for base46 extended_integrations | Improve syntax (#2459)
* performance: avoid reloading config (#2360) * performance: avoid reloading config * Rm outdated info in readme --------- Co-authored-by: Sidhanth Rathod <siduck@tutanota.com> * update nvchad load_config result path * Update utils.lua * update branch names * Fix unreachable mappings for the lsp (#2443) * add option for base46 integrations * rm nvchad_theme global * use correct conf path in lspconfig --------- Co-authored-by: georgejean <jeangeorge385@yahoo.fr> Co-authored-by: KorigamiK <72932688+KorigamiK@users.noreply.github.com>
This commit is contained in:
parent
cb27ae0ed1
commit
cc3289639b
|
@ -14,9 +14,6 @@ M.ui = {
|
||||||
theme = "onedark", -- default theme
|
theme = "onedark", -- default theme
|
||||||
transparency = false,
|
transparency = false,
|
||||||
|
|
||||||
-- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations
|
|
||||||
extended_integrations = {}, -- these aren't compiled by default, ex: "alpha", "notify"
|
|
||||||
|
|
||||||
-- cmp themeing
|
-- cmp themeing
|
||||||
cmp = {
|
cmp = {
|
||||||
icons = true,
|
icons = true,
|
||||||
|
@ -92,4 +89,25 @@ M.lazy_nvim = require "plugins.configs.lazy_nvim" -- config for lazy.nvim startu
|
||||||
|
|
||||||
M.mappings = require "core.mappings"
|
M.mappings = require "core.mappings"
|
||||||
|
|
||||||
|
M.base46 = {
|
||||||
|
integrations = {
|
||||||
|
"blankline",
|
||||||
|
"cmp",
|
||||||
|
"defaults",
|
||||||
|
"devicons",
|
||||||
|
"git",
|
||||||
|
"lsp",
|
||||||
|
"mason",
|
||||||
|
"nvchad_updater",
|
||||||
|
"nvcheatsheet",
|
||||||
|
"nvdash",
|
||||||
|
"nvimtree",
|
||||||
|
"statusline",
|
||||||
|
"syntax",
|
||||||
|
"tbline",
|
||||||
|
"telescope",
|
||||||
|
"whichkey",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -86,9 +86,6 @@ autocmd("BufWritePost", {
|
||||||
|
|
||||||
local config = require "nvconfig"
|
local config = require "nvconfig"
|
||||||
|
|
||||||
vim.g.nvchad_theme = config.ui.theme
|
|
||||||
vim.g.transparency = config.ui.transparency
|
|
||||||
|
|
||||||
-- statusline
|
-- statusline
|
||||||
if config.ui.statusline.theme ~= "custom" then
|
if config.ui.statusline.theme ~= "custom" then
|
||||||
require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme)
|
require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme)
|
||||||
|
|
|
@ -3,8 +3,8 @@ local M = {}
|
||||||
-- export on_attach & capabilities for custom lspconfigs
|
-- export on_attach & capabilities for custom lspconfigs
|
||||||
M.on_attach = function(client, bufnr)
|
M.on_attach = function(client, bufnr)
|
||||||
local utils = require "core.utils"
|
local utils = require "core.utils"
|
||||||
local conf = require "nvconfig"
|
local conf = require("nvconfig").ui.lsp
|
||||||
|
|
||||||
-- semanticTokens
|
-- semanticTokens
|
||||||
if not conf.semantic_tokens and client.supports_method "textDocument/semanticTokens" then
|
if not conf.semantic_tokens and client.supports_method "textDocument/semanticTokens" then
|
||||||
client.server_capabilities.semanticTokensProvider = nil
|
client.server_capabilities.semanticTokensProvider = nil
|
||||||
|
|
Loading…
Reference in New Issue