mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-21 08:35:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(extras): disable import handling when loading :LazyExtras + changed some recommendations

Browse source
This commit is contained in:
Folke Lemaitre 2025-02-10 23:27:24 +01:00
parent 66981fe5b2
commit 121a2e27ef
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
5 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lua/lazyvim/plugins/extras/coding/mini-surround.lua
View file

@ -4,7 +4,6 @@
-- and more. -- and more.
return { return {
"echasnovski/mini.surround", "echasnovski/mini.surround",
recommended = true,
keys = function(_, keys) keys = function(_, keys)
-- Populate the keys based on the user's options -- Populate the keys based on the user's options
local opts = LazyVim.opts("mini.surround") local opts = LazyVim.opts("mini.surround")

1
lua/lazyvim/plugins/extras/editor/fzf.lua
View file

@ -40,7 +40,6 @@ end
return { return {
desc = "Awesome picker for FZF (alternative to Telescope)", desc = "Awesome picker for FZF (alternative to Telescope)",
recommended = true,
{ {
"ibhagwan/fzf-lua", "ibhagwan/fzf-lua",
cmd = "FzfLua", cmd = "FzfLua",

40
lua/lazyvim/plugins/extras/editor/snacks_explorer.lua
View file

@ -1,24 +1,24 @@
return { return {
{ desc = "Snacks File Explorer",
"folke/snacks.nvim", recommended = true,
opts = { explorer = {} }, "folke/snacks.nvim",
keys = { opts = { explorer = {} },
{ keys = {
"<leader>fe", {
function() "<leader>fe",
Snacks.explorer({ cwd = LazyVim.root() }) function()
end, Snacks.explorer({ cwd = LazyVim.root() })
desc = "Explorer Snacks (root dir)", end,
}, desc = "Explorer Snacks (root dir)",
{
"<leader>fE",
function()
Snacks.explorer()
end,
desc = "Explorer Snacks (cwd)",
},
{ "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
{ "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
}, },
{
"<leader>fE",
function()
Snacks.explorer()
end,
desc = "Explorer Snacks (cwd)",
},
{ "<leader>e", "<leader>fe", desc = "Explorer Snacks (root dir)", remap = true },
{ "<leader>E", "<leader>fE", desc = "Explorer Snacks (cwd)", remap = true },
}, },
} }

1
lua/lazyvim/util/extras.lua
View file

@ -83,6 +83,7 @@ end
---@param modname string ---@param modname string
---@param source LazyExtraSource ---@param source LazyExtraSource
function M.get_extra(source, modname) function M.get_extra(source, modname)
LazyVim.plugin.handle_defaults = false
local enabled = vim.tbl_contains(M.state, modname) local enabled = vim.tbl_contains(M.state, modname)
local spec = Plugin.Spec.new(nil, { optional = true, pkg = false }) local spec = Plugin.Spec.new(nil, { optional = true, pkg = false })
spec:parse({ import = modname }) spec:parse({ import = modname })

3
lua/lazyvim/util/plugin.lua
View file

@ -5,6 +5,7 @@ local M = {}
---@type string[] ---@type string[]
M.core_imports = {} M.core_imports = {}
M.handle_defaults = true
M.lazy_file_events = { "BufReadPost", "BufNewFile", "BufWritePre" } M.lazy_file_events = { "BufReadPost", "BufNewFile", "BufWritePre" }
@ -81,7 +82,7 @@ end
function M.fix_imports() function M.fix_imports()
local defaults ---@type table<string, LazyVimDefault> local defaults ---@type table<string, LazyVimDefault>
Plugin.Spec.import = LazyVim.inject.args(Plugin.Spec.import, function(_, spec) Plugin.Spec.import = LazyVim.inject.args(Plugin.Spec.import, function(_, spec)
if LazyVim.config.json.loaded then if M.handle_defaults and LazyVim.config.json.loaded then
-- extra disabled by defaults? -- extra disabled by defaults?
defaults = defaults or LazyVim.config.get_defaults() defaults = defaults or LazyVim.config.get_defaults()
local def = defaults[spec.import] local def = defaults[spec.import]