End/neovim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mappings: Only set mappings if the plugin is enabled

Browse source 
format files

fix some lsp warnings
This commit is contained in:
Akianonymus 2022-08-04 20:02:16 +05:30 • committed by Sidhanth Rathod
parent d7b97dfe63
commit f4655e13ec
5 changed files with 65 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lua/plugins/configs/lspconfig.lua
View file

@ -23,8 +23,7 @@ M.on_attach = function(client, bufnr)
client.resolved_capabilities.document_range_formatting = false
end
local lsp_mappings = utils.load_config().mappings.lspconfig
utils.load_mappings({ lsp_mappings }, { buffer = bufnr })
utils.load_mappings("lspconfig", { buffer = bufnr })
if client.server_capabilities.signatureHelpProvider then
require("nvchad_ui.signature").setup(client)

10
lua/plugins/configs/whichkey.lua
View file

@ -38,14 +38,4 @@ local options = {
options = require("core.utils").load_override(options, "folke/which-key.nvim")
local utils = require "core.utils"
local mappings = utils.load_config().mappings
local mapping_groups = { groups = vim.deepcopy(mappings.groups) }
mappings.disabled = nil
mappings.groups = nil
utils.load_mappings(mapping_groups)
wk.setup(options)

24
lua/plugins/init.lua
View file

@ -21,6 +21,12 @@ local plugins = {
config = function()
require("plugins.configs.others").nvchad_ui()
end,
setup = function()
local load_override = require("core.utils").load_override
if load_override({}, "NvChad/ui")["tabufline"]["enabled"] then
require("core.utils").load_mappings "tabufline"
end
end,
},
["NvChad/nvterm"] = {
@ -28,10 +34,13 @@ local plugins = {
config = function()
require "plugins.configs.nvterm"
end,
setup = function()
require("core.utils").load_mappings "nvterm"
end,
},
["kyazdani42/nvim-web-devicons"] = {
after = 'ui',
after = "ui",
module = "nvim-web-devicons",
config = function()
require("plugins.configs.others").devicons()
@ -42,6 +51,7 @@ local plugins = {
opt = true,
setup = function()
require("core.lazy_load").on_file_open "indent-blankline.nvim"
require("core.utils").load_mappings "blankline"
end,
config = function()
require("plugins.configs.others").blankline()
@ -164,6 +174,9 @@ local plugins = {
config = function()
require("plugins.configs.others").comment()
end,
setup = function()
require("core.utils").load_mappings "comment"
end,
},
-- file managing , picker etc
@ -173,6 +186,9 @@ local plugins = {
config = function()
require "plugins.configs.nvimtree"
end,
setup = function()
require("core.utils").load_mappings "nvimtree"
end,
},
["nvim-telescope/telescope.nvim"] = {
@ -180,6 +196,9 @@ local plugins = {
config = function()
require "plugins.configs.telescope"
end,
setup = function()
require("core.utils").load_mappings "telescope"
end,
},
-- Only load whichkey after all the gui
@ -188,6 +207,9 @@ local plugins = {
config = function()
require "plugins.configs.whichkey"
end,
setup = function()
require("core.utils").load_mappings "whichkey"
end,
},
}