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

remove usage of globals for util functions

Browse source
This commit is contained in:
siduck 2022-05-29 16:07:47 +05:30
parent 0f013d4e7b
commit cb97cef2a7
18 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/plugins/configs/alpha.lua
View file

@ -72,7 +72,7 @@ options.buttons = {
},
}
options = nvchad.load_override(options, "goolord/alpha-nvim")
options = require("core.utils").load_override(options, "goolord/alpha-nvim")
-- dynamic header padding
local fn = vim.fn

2
lua/plugins/configs/bufferline.lua
View file

@ -65,6 +65,6 @@ local options = {
}
-- check for any override
options = nvchad.load_override(options, "akinsho/bufferline.nvim")
options = require("core.utils").load_override(options, "akinsho/bufferline.nvim")
bufferline.setup(options)

8
lua/plugins/configs/cmp.lua
View file

@ -23,9 +23,9 @@ local cmp_window = require "cmp.utils.window"
cmp_window.info_ = cmp_window.info
cmp_window.info = function(self)
local info = self:info_()
info.scrollable = false
return info
local info = self:info_()
info.scrollable = false
return info
end
local options = {
@ -96,6 +96,6 @@ local options = {
}
-- check for any override
options = nvchad.load_override(options, "hrsh7th/nvim-cmp")
options = require("core.utils").load_override(options, "hrsh7th/nvim-cmp")
cmp.setup(options)

2
lua/plugins/configs/icons.lua
View file

@ -118,6 +118,6 @@ local options = {
}
-- check for any override
options = nvchad.load_override(options, "kyazdani42/nvim-web-devicons")
options = require("core.utils").load_override(options, "kyazdani42/nvim-web-devicons")
devicons.setup(options)

2
lua/plugins/configs/lsp_installer.lua
View file

@ -31,6 +31,6 @@ local options = {
max_concurrent_installers = 20,
}
options = nvchad.load_override(options, "williamboman/nvim-lsp-installer")
options = require("core.utils").load_override(options, "williamboman/nvim-lsp-installer")
lsp_installer.setup(options)

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

@ -22,8 +22,8 @@ M.on_attach = function(client, bufnr)
client.resolved_capabilities.document_formatting = false
client.resolved_capabilities.document_range_formatting = false
local lsp_mappings = nvchad.load_config().mappings.lspconfig
nvchad.load_mappings({ lsp_mappings }, { buffer = bufnr })
local lsp_mappings = require("core.utils").load_config().mappings.lspconfig
require("core.utils").load_mappings({ lsp_mappings }, { buffer = bufnr })
end
local capabilities = vim.lsp.protocol.make_client_capabilities()
@ -68,7 +68,7 @@ lspconfig.sumneko_lua.setup {
}
-- requires a file containing user's lspconfigs
local addlsp_confs = nvchad.load_config().plugins.options.lspconfig.setup_lspconf
local addlsp_confs = require("core.utils").load_config().plugins.options.lspconfig.setup_lspconf
if #addlsp_confs ~= 0 then
require(addlsp_confs).setup_lsp(M.on_attach, capabilities)

2
lua/plugins/configs/nvimtree.lua
View file

@ -78,6 +78,6 @@ local options = {
}
-- check for any override
options = nvchad.load_override(options, "kyazdani42/nvim-tree.lua")
options = require("core.utils").load_override(options, "kyazdani42/nvim-tree.lua")
nvimtree.setup(options)

2
lua/plugins/configs/nvterm.lua
View file

@ -27,6 +27,6 @@ local options = {
enable_new_mappings = true,
}
options = nvchad.load_override(options, "NvChad/nvterm")
options = require("core.utils").load_override(options, "NvChad/nvterm")
nvterm.setup(options)

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

@ -1,5 +1,7 @@
local M = {}
local load_override = require("core.utils").load_override
M.autopairs = function()
local present1, autopairs = pcall(require, "nvim-autopairs")
local present2, cmp = pcall(require, "cmp")
@ -32,7 +34,7 @@ M.better_escape = function()
keys = "<Esc>",
}
options = nvchad.load_override(options, "max397574/better-escape.nvim")
options = load_override(options, "max397574/better-escape.nvim")
escape.setup(options)
end
@ -63,7 +65,7 @@ M.blankline = function()
show_first_indent_level = false,
}
options = nvchad.load_override(options, "lukas-reineke/indent-blankline.nvim")
options = load_override(options, "lukas-reineke/indent-blankline.nvim")
blankline.setup(options)
end
@ -93,7 +95,7 @@ M.colorizer = function()
},
}
options = nvchad.load_override(options, "NvChad/nvim-colorizer.lua")
options = load_override(options, "NvChad/nvim-colorizer.lua")
colorizer.setup(options["filetypes"], options["user_default_options"])
vim.cmd "ColorizerReloadAllBuffers"
@ -149,7 +151,7 @@ M.signature = function()
padding = "", -- character to pad on left and right of signature can be ' ', or '|' etc
}
options = nvchad.load_override(options, "ray-x/lsp_signature.nvim")
options = load_override(options, "ray-x/lsp_signature.nvim")
lsp_signature.setup(options)
end

4
lua/plugins/configs/statusline.lua
View file

@ -50,7 +50,7 @@ options.icon_styles = {
},
}
options.separator_style = options.icon_styles[nvchad.load_config().plugins.options.statusline.separator_style]
options.separator_style = options.icon_styles[require("core.utils").load_config().plugins.options.statusline.separator_style]
options.main_icon = {
provider = options.separator_style.main_icon,
@ -312,7 +312,7 @@ options.current_line = {
hl = "Feline_CurrentLine",
}
options = nvchad.load_override(options, "feline-nvim/feline.nvim")
options = require("core.utils").load_override(options, "feline-nvim/feline.nvim")
local function add_table(tbl, inject)
if inject then

2
lua/plugins/configs/telescope.lua
View file

@ -59,7 +59,7 @@ local options = {
}
-- check for any override
options = nvchad.load_override(options, "nvim-telescope/telescope.nvim")
options = require("core.utils").load_override(options, "nvim-telescope/telescope.nvim")
telescope.setup(options)
-- load extensions

2
lua/plugins/configs/treesitter.lua
View file

@ -16,6 +16,6 @@ local options = {
}
-- check for any override
options = nvchad.load_override(options, "nvim-treesitter/nvim-treesitter")
options = require("core.utils").load_override(options, "nvim-treesitter/nvim-treesitter")
treesitter.setup(options)

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

@ -34,15 +34,17 @@ local options = {
},
}
options = nvchad.load_override(options, "folke/which-key.nvim")
options = require("core.utils").load_override(options, "folke/which-key.nvim")
local mappings = nvchad.load_config().mappings
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
nvchad.load_mappings()
nvchad.load_mappings(mapping_groups)
utils.load_mappings()
utils.load_mappings(mapping_groups)
wk.setup(options)