Merge branch 'master' into master

This commit is contained in:
Zane Fernandes 2024-07-19 18:45:42 +05:30 committed by GitHub
commit 64089fee85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 17 deletions

View File

@ -209,7 +209,10 @@ vim.api.nvim_create_autocmd('TextYankPost', {
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
if not vim.loop.fs_stat(lazypath) then
local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
if vim.v.shell_error ~= 0 then
error('Error cloning lazy.nvim:\n' .. out)
end
end ---@diagnostic disable-next-line: undefined-field
vim.opt.rtp:prepend(lazypath)
@ -300,22 +303,18 @@ require('lazy').setup({
require('which-key').setup()
-- Document existing key chains
require('which-key').register {
['<leader>q'] = { { '<cmd>confirm q<cr>', 'Quit' } },
['<leader>w'] = { { '<cmd>w!<cr>', 'Write' } },
['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
['<leader>i'] = { name = '[I]nformation', _ = 'which_key_ignore' },
['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
['<leader>tt'] = { { '<cmd>set relativenumber!<CR>', 'Toggle Relative Number' } },
require('which-key').add {
{ '<leader>q', '<cmd>confirm q<cr>', desc = 'Quit', mode = 'n' },
{ '<leader>w', '<cmd>w!<cr>', desc = 'Write', mode = 'n' },
{ '<leader>c', group = '[C]ode' },
{ '<leader>d', group = '[D]ocument' },
{ '<leader>r', group = '[R]ename' },
{ '<leader>s', group = '[S]earch' },
{ '<leader>i', group = '[I]nformation' },
{ '<leader>t', group = '[T]oggle' },
{ '<leader>h', group = 'Git [H]unk' },
{ '<leader>tt', '<cmd>set relativenumber!<CR>', desc = 'Toggle Relative Number', mode = 'n' },
}
-- visual mode
require('which-key').register({
['<leader>h'] = { 'Git [H]unk' },
}, { mode = 'v' })
end,
},
@ -881,7 +880,7 @@ require('lazy').setup({
'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate',
opts = {
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
-- Autoinstall languages that are not installed
auto_install = true,
highlight = {