From fd3198e899ebd966f3aee060553f8d1d153b50da Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 18 Feb 2025 16:07:22 +0000 Subject: [PATCH] lazyvim: extract opts function into util/lazy --- nvim/lua/plugins/lsp/init.lua | 2 +- nvim/lua/plugins/lsp/keymaps.lua | 2 +- nvim/lua/rmz/util/init.lua | 1 + nvim/lua/rmz/util/lazy.lua | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 nvim/lua/rmz/util/lazy.lua diff --git a/nvim/lua/plugins/lsp/init.lua b/nvim/lua/plugins/lsp/init.lua index d32e76c..af50c8c 100644 --- a/nvim/lua/plugins/lsp/init.lua +++ b/nvim/lua/plugins/lsp/init.lua @@ -128,7 +128,7 @@ return { ensure_installed = vim.tbl_deep_extend( "force", ensure_installed, - LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {} + rmz.lazy.opts("mason-lspconfig.nvim").ensure_installed or {} ), handlers = { setup }, }) diff --git a/nvim/lua/plugins/lsp/keymaps.lua b/nvim/lua/plugins/lsp/keymaps.lua index 7cb2b49..42e210b 100644 --- a/nvim/lua/plugins/lsp/keymaps.lua +++ b/nvim/lua/plugins/lsp/keymaps.lua @@ -68,7 +68,7 @@ function M.resolve(buffer) return {} end local spec = vim.tbl_extend("force", {}, M.get()) - local opts = LazyVim.opts("nvim-lspconfig") + local opts = rmz.lazy.opts("nvim-lspconfig") local clients = rmz.lsp.get_clients({ bufnr = buffer }) for _, client in ipairs(clients) do local maps = opts.servers[client.name] and opts.servers[client.name].keys or {} diff --git a/nvim/lua/rmz/util/init.lua b/nvim/lua/rmz/util/init.lua index 7d519f1..54d8f6b 100644 --- a/nvim/lua/rmz/util/init.lua +++ b/nvim/lua/rmz/util/init.lua @@ -1,6 +1,7 @@ ---@class rmz.util local M = { ui = require("rmz.util.ui"), + lazy = require("rmz.util.lazy"), lsp = require("rmz.util.lsp"), } diff --git a/nvim/lua/rmz/util/lazy.lua b/nvim/lua/rmz/util/lazy.lua new file mode 100644 index 0000000..9a64c69 --- /dev/null +++ b/nvim/lua/rmz/util/lazy.lua @@ -0,0 +1,19 @@ +---@class rmz.util.lazy +local M = {} + +---@param name string +function M.get_plugin(name) + return require("lazy.core.config").spec.plugins[name] +end + +---@param name string +function M.opts(name) + local plugin = M.get_plugin(name) + if not plugin then + return {} + end + local Plugin = require("lazy.core.plugin") + return Plugin.values(plugin, "opts", false) +end + +return M -- 2.48.1