Merge branch 'nvim-lua:master' into master

This commit is contained in:
Androne Cristian-Paul 2026-03-20 06:47:14 -04:00 committed by GitHub
commit b286506b99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 110 additions and 116 deletions

View File

@ -262,7 +262,7 @@ available methods being discussed
<details><summary>Bob</summary>
[Bob](https://github.com/MordechaiHadad/bob) is a Neovim version manager for
all plattforms. Simply install
all platforms. Simply install
[rustup](https://rust-lang.github.io/rustup/installation/other.html),
and run the following commands:

View File

@ -339,7 +339,7 @@ require('lazy').setup({
spec = {
{ '<leader>s', group = '[S]earch', mode = { 'n', 'v' } },
{ '<leader>t', group = '[T]oggle' },
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first
{ 'gr', group = 'LSP Actions', mode = { 'n' } },
},
},
@ -521,9 +521,6 @@ require('lazy').setup({
-- Useful status updates for LSP.
{ 'j-hui/fidget.nvim', opts = {} },
-- Allows extra capabilities provided by blink.cmp
'saghen/blink.cmp',
},
config = function()
-- Brief aside: **What is LSP?**
@ -941,7 +938,7 @@ require('lazy').setup({
-- require 'kickstart.plugins.lint',
-- require 'kickstart.plugins.autopairs',
-- require 'kickstart.plugins.neo-tree',
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommended keymaps
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-- This is the easiest way to modularize your config.

View File

@ -5,7 +5,6 @@
---@module 'lazy'
---@type LazySpec
return {
{
'lewis6991/gitsigns.nvim',
---@module 'gitsigns'
---@type Gitsigns.Config
@ -56,5 +55,4 @@ return {
map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
end,
},
},
}

View File

@ -1,7 +1,8 @@
-- Add indentation guides even on blank lines
---@module 'lazy'
---@type LazySpec
return {
{ -- Add indentation guides even on blank lines
'lukas-reineke/indent-blankline.nvim',
-- Enable `lukas-reineke/indent-blankline.nvim`
-- See `:help ibl`
@ -9,5 +10,4 @@ return {
---@module 'ibl'
---@type ibl.config
opts = {},
},
}

View File

@ -1,8 +1,8 @@
-- Linting
---@module 'lazy'
---@type LazySpec
return {
{ -- Linting
'mfussenegger/nvim-lint',
event = { 'BufReadPre', 'BufNewFile' },
config = function()
@ -56,5 +56,4 @@ return {
end,
})
end,
},
}