diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 248360a9..69ce6d41 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -83,8 +83,8 @@ return { { "echasnovski/mini.pairs", event = "VeryLazy", - config = function() - require("mini.pairs").setup({}) + config = function(_, opts) + require("mini.pairs").setup(opts) end, }, @@ -92,19 +92,20 @@ return { { "echasnovski/mini.surround", keys = { "gz" }, - config = function() + opts = { + mappings = { + add = "gza", -- Add surrounding in Normal and Visual modes + delete = "gzd", -- Delete surrounding + find = "gzf", -- Find surrounding (to the right) + find_left = "gzF", -- Find surrounding (to the left) + highlight = "gzh", -- Highlight surrounding + replace = "gzr", -- Replace surrounding + update_n_lines = "gzn", -- Update `n_lines` + }, + }, + config = function(_, opts) -- use gz mappings instead of s to prevent conflict with leap - require("mini.surround").setup({ - mappings = { - add = "gza", -- Add surrounding in Normal and Visual modes - delete = "gzd", -- Delete surrounding - find = "gzf", -- Find surrounding (to the right) - find_left = "gzF", -- Find surrounding (to the left) - highlight = "gzh", -- Highlight surrounding - replace = "gzr", -- Replace surrounding - update_n_lines = "gzn", -- Update `n_lines` - }, - }) + require("mini.surround").setup(opts) end, }, @@ -113,14 +114,15 @@ return { { "echasnovski/mini.comment", event = "VeryLazy", - config = function() - require("mini.comment").setup({ - hooks = { - pre = function() - require("ts_context_commentstring.internal").update_commentstring({}) - end, - }, - }) + opts = { + hooks = { + pre = function() + require("ts_context_commentstring.internal").update_commentstring({}) + end, + }, + }, + config = function(_, opts) + require("mini.comment").setup(opts) end, }, diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua index 42eeb545..9ba64a06 100644 --- a/lua/lazyvim/plugins/editor.lua +++ b/lua/lazyvim/plugins/editor.lua @@ -117,8 +117,12 @@ return { "ggandor/leap.nvim", event = "VeryLazy", dependencies = { { "ggandor/flit.nvim", opts = { labeled_modes = "nv" } } }, - config = function() - require("leap").add_default_mappings(true) + config = function(_, opts) + local leap = require("leap") + for k, v in pairs(opts) do + leap.opts[k] = v + end + leap.add_default_mappings(true) end, }, @@ -196,8 +200,9 @@ return { { "RRethy/vim-illuminate", event = "BufReadPost", - config = function() - require("illuminate").configure({ delay = 200 }) + opts = { delay = 200 }, + config = function(_, opts) + require("illuminate").configure(opts) end, -- stylua: ignore keys = { diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua index fd3d203c..217a26df 100644 --- a/lua/lazyvim/plugins/ui.lua +++ b/lua/lazyvim/plugins/ui.lua @@ -167,18 +167,19 @@ return { "echasnovski/mini.indentscope", version = false, -- wait till new 0.7.0 release to put it back on semver event = "BufReadPre", - config = function() + opts = { + -- symbol = "▏", + symbol = "│", + options = { try_as_border = true }, + }, + config = function(_, opts) vim.api.nvim_create_autocmd("FileType", { pattern = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy", "mason" }, callback = function() vim.b.miniindentscope_disable = true end, }) - require("mini.indentscope").setup({ - -- symbol = "▏", - symbol = "│", - options = { try_as_border = true }, - }) + require("mini.indentscope").setup(opts) end, },