mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-25 14:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix duplicate which-key install

Browse source
This commit is contained in:
Parham Moieni 2023-10-02 20:35:03 +03:30
parent 7c5a458761
commit b24efafbe1
2 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lua/lazyvim/plugins/editor.lua
View file

@ -277,27 +277,33 @@ return {
{ {
"folke/which-key.nvim", "folke/which-key.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = { opts = function (_, opts)
plugins = { spelling = true }, if require("lazyvim.util").has("noice.nvim") then
defaults = { opts.defaults["<leader>sn"] = { name = "+noice" }
mode = { "n", "v" }, end
["g"] = { name = "+goto" },
["gz"] = { name = "+surround" }, return {
["]"] = { name = "+next" }, plugins = { spelling = true },
["["] = { name = "+prev" }, defaults = {
["<leader><tab>"] = { name = "+tabs" }, mode = { "n", "v" },
["<leader>b"] = { name = "+buffer" }, ["g"] = { name = "+goto" },
["<leader>c"] = { name = "+code" }, ["gz"] = { name = "+surround" },
["<leader>f"] = { name = "+file/find" }, ["]"] = { name = "+next" },
["<leader>g"] = { name = "+git" }, ["["] = { name = "+prev" },
["<leader>gh"] = { name = "+hunks" }, ["<leader><tab>"] = { name = "+tabs" },
["<leader>q"] = { name = "+quit/session" }, ["<leader>b"] = { name = "+buffer" },
["<leader>s"] = { name = "+search" }, ["<leader>c"] = { name = "+code" },
["<leader>u"] = { name = "+ui" }, ["<leader>f"] = { name = "+file/find" },
["<leader>w"] = { name = "+windows" }, ["<leader>g"] = { name = "+git" },
["<leader>x"] = { name = "+diagnostics/quickfix" }, ["<leader>gh"] = { name = "+hunks" },
}, ["<leader>q"] = { name = "+quit/session" },
}, ["<leader>s"] = { name = "+search" },
["<leader>u"] = { name = "+ui" },
["<leader>w"] = { name = "+windows" },
["<leader>x"] = { name = "+diagnostics/quickfix" },
},
}
end,
config = function(_, opts) config = function(_, opts)
local wk = require("which-key") local wk = require("which-key")
wk.setup(opts) wk.setup(opts)

10
lua/lazyvim/plugins/ui.lua
View file

@ -224,16 +224,6 @@ return {
end, end,
}, },
-- Displays a popup with possible key bindings of the command you started typing
{
"folke/which-key.nvim",
opts = function(_, opts)
if require("lazyvim.util").has("noice.nvim") then
opts.defaults["<leader>sn"] = { name = "+noice" }
end
end,
},
-- Highly experimental plugin that completely replaces the UI for messages, cmdline and the popupmenu. -- Highly experimental plugin that completely replaces the UI for messages, cmdline and the popupmenu.
{ {
"folke/noice.nvim", "folke/noice.nvim",