Merge branch 'nvim-lua:master' into master

This commit is contained in:
Jack Jarosz 2024-09-01 15:25:53 -05:00 committed by GitHub
commit 450ee01490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 39 additions and 41 deletions

View File

@ -274,8 +274,7 @@ require('lazy').setup({
{ -- Useful plugin to show you pending keybinds. { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim', 'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = 'VimEnter', -- Sets the loading event to 'VimEnter'
config = function() -- This is the function that runs, AFTER loading opts = {
require('which-key').setup {
icons = { icons = {
-- set icon mappings to true if you have a Nerd Font -- set icon mappings to true if you have a Nerd Font
mappings = vim.g.have_nerd_font, mappings = vim.g.have_nerd_font,
@ -312,10 +311,9 @@ require('lazy').setup({
F12 = '<F12>', F12 = '<F12>',
}, },
}, },
}
-- Document existing key chains -- Document existing key chains
require('which-key').add { spec = {
{ '<leader>c', group = '[C]ode', mode = { 'n', 'x' } }, { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
{ '<leader>d', group = '[D]ocument' }, { '<leader>d', group = '[D]ocument' },
{ '<leader>r', group = '[R]ename' }, { '<leader>r', group = '[R]ename' },
@ -323,8 +321,8 @@ require('lazy').setup({
{ '<leader>w', group = '[W]orkspace' }, { '<leader>w', group = '[W]orkspace' },
{ '<leader>t', group = '[T]oggle' }, { '<leader>t', group = '[T]oggle' },
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } }, { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
} },
end, },
}, },
-- NOTE: Plugins can specify dependencies. -- NOTE: Plugins can specify dependencies.