From 23773900d9a2e1079a1a04d31adce5c5e901db6f Mon Sep 17 00:00:00 2001
From: Viet <51826956+hoangvietdo@users.noreply.github.com>
Date: Tue, 9 Apr 2024 05:13:22 +0900
Subject: [PATCH 01/15] Update README (#832)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5ca19d7a..4dd8ac87 100644
--- a/README.md
+++ b/README.md
@@ -253,7 +253,7 @@ sudo apt install make gcc ripgrep unzip neovim
```
sudo add-apt-repository ppa:neovim-ppa/unstable -y
sudo apt update
-sudo apt install make gcc ripgrep unzip neovim
+sudo apt install make gcc ripgrep unzip git neovim
```
Debian Install Steps
From e2bfa0c66f474f7d8863a8bc05e3d5bdf704f7bf Mon Sep 17 00:00:00 2001
From: rdvm
Date: Tue, 16 Apr 2024 10:29:27 -0500
Subject: [PATCH 02/15] Arch, btw (#852)
* Arch, btw
* Add unzip
* Add unzip for Fedora and --needed arg for Arch
---
README.md | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4dd8ac87..e67b94a3 100644
--- a/README.md
+++ b/README.md
@@ -269,7 +269,14 @@ sudo apt install -t unstable neovim
Fedora Install Steps
```
-sudo dnf install -y gcc make git ripgrep fd-find neovim
+sudo dnf install -y gcc make git ripgrep fd-find unzip neovim
+```
+Arch Install Steps
+
+```
+sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim
```
- Adding autopairs
-
-This will automatically install [windwp/nvim-autopairs](https://github.com/windwp/nvim-autopairs)
-and enable it on startup. For more information, see documentation for
-[lazy.nvim](https://github.com/folke/lazy.nvim).
-
-In the file: `lua/custom/plugins/autopairs.lua`, add:
-
-```lua
--- File: lua/custom/plugins/autopairs.lua
-
-return {
- "windwp/nvim-autopairs",
- -- Optional dependency
- dependencies = { 'hrsh7th/nvim-cmp' },
- config = function()
- require("nvim-autopairs").setup {}
- -- If you want to automatically add `(` after selecting a function or method
- local cmp_autopairs = require('nvim-autopairs.completion.cmp')
- local cmp = require('cmp')
- cmp.event:on(
- 'confirm_done',
- cmp_autopairs.on_confirm_done()
- )
- end,
-}
-```
-
-
-
- Adding a file tree plugin
-
-This will install the tree plugin and add the command `:Neotree` for you.
-For more information, see the documentation at
-[neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim).
-
-In the file: `lua/custom/plugins/filetree.lua`, add:
-
-```lua
--- File: lua/custom/plugins/filetree.lua
-
-return {
- "nvim-neo-tree/neo-tree.nvim",
- version = "*",
- dependencies = {
- "nvim-lua/plenary.nvim",
- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
- "MunifTanjim/nui.nvim",
- },
- config = function ()
- require('neo-tree').setup {}
- end,
-}
-```
-
-
-
### Getting Started
[The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o)
diff --git a/init.lua b/init.lua
index 4bd9b7f5..21d7df83 100644
--- a/init.lua
+++ b/init.lua
@@ -854,6 +854,8 @@ require('lazy').setup({
-- require 'kickstart.plugins.debug',
-- require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint',
+ -- require 'kickstart.plugins.autopairs',
+ -- require 'kickstart.plugins.neo-tree',
-- 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.
diff --git a/lua/kickstart/plugins/autopairs.lua b/lua/kickstart/plugins/autopairs.lua
new file mode 100644
index 00000000..87a7e5ff
--- /dev/null
+++ b/lua/kickstart/plugins/autopairs.lua
@@ -0,0 +1,16 @@
+-- autopairs
+-- https://github.com/windwp/nvim-autopairs
+
+return {
+ 'windwp/nvim-autopairs',
+ event = 'InsertEnter',
+ -- Optional dependency
+ dependencies = { 'hrsh7th/nvim-cmp' },
+ config = function()
+ require('nvim-autopairs').setup {}
+ -- If you want to automatically add `(` after selecting a function or method
+ local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
+ local cmp = require 'cmp'
+ cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+ end,
+}
diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua
new file mode 100644
index 00000000..c793b885
--- /dev/null
+++ b/lua/kickstart/plugins/neo-tree.lua
@@ -0,0 +1,25 @@
+-- Neo-tree is a Neovim plugin to browse the file system
+-- https://github.com/nvim-neo-tree/neo-tree.nvim
+
+return {
+ 'nvim-neo-tree/neo-tree.nvim',
+ version = '*',
+ dependencies = {
+ 'nvim-lua/plenary.nvim',
+ 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
+ 'MunifTanjim/nui.nvim',
+ },
+ cmd = 'Neotree',
+ keys = {
+ { '\\', ':Neotree reveal', { desc = 'NeoTree reveal' } },
+ },
+ opts = {
+ filesystem = {
+ window = {
+ mappings = {
+ ['\\'] = 'close_window',
+ },
+ },
+ },
+ },
+}
From f5c9fe8e15aafb6857706e3c05b5eee4ecb98a2b Mon Sep 17 00:00:00 2001
From: Damjan 9000
Date: Thu, 18 Apr 2024 03:00:39 +0200
Subject: [PATCH 07/15] Add gitsigns recommended keymaps as an optional plugin
(#858)
---
init.lua | 6 +++
lua/kickstart/plugins/gitsigns.lua | 61 ++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
create mode 100644 lua/kickstart/plugins/gitsigns.lua
diff --git a/init.lua b/init.lua
index 21d7df83..a182828e 100644
--- a/init.lua
+++ b/init.lua
@@ -287,7 +287,12 @@ require('lazy').setup({
['s'] = { name = '[S]earch', _ = 'which_key_ignore' },
['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
['t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
+ ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
}
+ -- visual mode
+ require('which-key').register({
+ ['h'] = { 'Git [H]unk' },
+ }, { mode = 'v' })
end,
},
@@ -856,6 +861,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
-- 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.
diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua
new file mode 100644
index 00000000..4bcc70f4
--- /dev/null
+++ b/lua/kickstart/plugins/gitsigns.lua
@@ -0,0 +1,61 @@
+-- Adds git related signs to the gutter, as well as utilities for managing changes
+-- NOTE: gitsigns is already included in init.lua but contains only the base
+-- config. This will add also the recommended keymaps.
+
+return {
+ {
+ 'lewis6991/gitsigns.nvim',
+ opts = {
+ on_attach = function(bufnr)
+ local gitsigns = require 'gitsigns'
+
+ local function map(mode, l, r, opts)
+ opts = opts or {}
+ opts.buffer = bufnr
+ vim.keymap.set(mode, l, r, opts)
+ end
+
+ -- Navigation
+ map('n', ']c', function()
+ if vim.wo.diff then
+ vim.cmd.normal { ']c', bang = true }
+ else
+ gitsigns.nav_hunk 'next'
+ end
+ end, { desc = 'Jump to next git [c]hange' })
+
+ map('n', '[c', function()
+ if vim.wo.diff then
+ vim.cmd.normal { '[c', bang = true }
+ else
+ gitsigns.nav_hunk 'prev'
+ end
+ end, { desc = 'Jump to previous git [c]hange' })
+
+ -- Actions
+ -- visual mode
+ map('v', 'hs', function()
+ gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'stage git hunk' })
+ map('v', 'hr', function()
+ gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'reset git hunk' })
+ -- normal mode
+ map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
+ map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
+ map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
+ map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
+ map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
+ map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
+ map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
+ map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
+ map('n', 'hD', function()
+ gitsigns.diffthis '@'
+ end, { desc = 'git [D]iff against last commit' })
+ -- Toggles
+ map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
+ map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
+ end,
+ },
+ },
+}
From b07176aef66948fa9de810174d3fc8a780eb8953 Mon Sep 17 00:00:00 2001
From: GameFuzzy
Date: Fri, 19 Apr 2024 19:50:42 +0200
Subject: [PATCH 08/15] fix: restore Mason config timing for DAP startup
(again) (#865)
---
init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index a182828e..62d2c5cf 100644
--- a/init.lua
+++ b/init.lua
@@ -412,7 +412,7 @@ require('lazy').setup({
'neovim/nvim-lspconfig',
dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim
- 'williamboman/mason.nvim',
+ { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
'williamboman/mason-lspconfig.nvim',
'WhoIsSethDaniel/mason-tool-installer.nvim',
From 931ec5c226b8440fa3ed066a6a2fbe78e29bf5e1 Mon Sep 17 00:00:00 2001
From: Evan Carroll
Date: Sat, 20 Apr 2024 10:55:01 -0500
Subject: [PATCH 09/15] Update README.md (#860)
Attempted fix for #859, provide reasonable Debian install instructions -- comment on GitHub issue with refinement.
---
README.md | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index a427def2..4cb89536 100644
--- a/README.md
+++ b/README.md
@@ -200,9 +200,14 @@ sudo apt install make gcc ripgrep unzip git neovim
```
sudo apt update
sudo apt install make gcc ripgrep unzip git
-echo "deb https://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list
-sudo apt update
-sudo apt install -t unstable neovim
+
+# Now we install nvim
+curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
+sudo rm -rf /opt/nvim
+sudo tar -C /opt -xzf nvim-linux64.tar.gz
+
+# make it available in /usr/local/bin, distro installs to /usr/bin
+sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/
```
Fedora Install Steps
From 9f5176fc2a30fbf5f0601ba1c84a345a4943bac2 Mon Sep 17 00:00:00 2001
From: Damjan 9000
Date: Sat, 20 Apr 2024 19:14:24 +0200
Subject: [PATCH 10/15] Minor improvements of debian install instructions.
Fixes #859 (#869)
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 4cb89536..dd51f209 100644
--- a/README.md
+++ b/README.md
@@ -199,11 +199,13 @@ sudo apt install make gcc ripgrep unzip git neovim
```
sudo apt update
-sudo apt install make gcc ripgrep unzip git
+sudo apt install make gcc ripgrep unzip git curl
# Now we install nvim
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
-sudo rm -rf /opt/nvim
+sudo rm -rf /opt/nvim-linux64
+sudo mkdir -p /opt/nvim-linux64
+sudo chmod a+rX /opt/nvim-linux64
sudo tar -C /opt -xzf nvim-linux64.tar.gz
# make it available in /usr/local/bin, distro installs to /usr/bin
From 2e68a2c2532d1575b717721a34efa033f4d7a88e Mon Sep 17 00:00:00 2001
From: Damjan 9000
Date: Sat, 20 Apr 2024 19:14:49 +0200
Subject: [PATCH 11/15] Add a commented out example of the classic complete
keymaps. Fixes #866 (#868)
---
init.lua | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/init.lua b/init.lua
index 62d2c5cf..3c70d736 100644
--- a/init.lua
+++ b/init.lua
@@ -720,6 +720,12 @@ require('lazy').setup({
-- This will expand snippets if the LSP sent a snippet.
[''] = cmp.mapping.confirm { select = true },
+ -- If you prefer more traditional completion keymaps,
+ -- you can uncomment the following lines
+ --[''] = cmp.mapping.confirm { select = true },
+ --[''] = cmp.mapping.select_next_item(),
+ --[''] = cmp.mapping.select_prev_item(),
+
-- Manually trigger a completion from nvim-cmp.
-- Generally you don't need this, because nvim-cmp will display
-- completions whenever it has completion options available.
From f92fb11d681a29f02ba144227142dfcf18297da7 Mon Sep 17 00:00:00 2001
From: Vladislav Grechannik <52157081+VlaDexa@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:27:13 +0200
Subject: [PATCH 12/15] Fix deprecation notice of inlay hints (#873)
---
init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index 3c70d736..256da5b8 100644
--- a/init.lua
+++ b/init.lua
@@ -531,7 +531,7 @@ require('lazy').setup({
-- This may be unwanted, since they displace some of your code
if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then
map('th', function()
- vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled())
+ vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end, '[T]oggle Inlay [H]ints')
end
end,
From 81f270a704ffe428ffe221122e0b1604567ae6cd Mon Sep 17 00:00:00 2001
From: Francis Belanger
Date: Mon, 22 Apr 2024 11:43:10 -0400
Subject: [PATCH 13/15] Fix highlight errors when lsp crash or stop (#864)
* Fix highlight errors when lsp crash or stop
It adds a check wether the client is still available before
highlighting.
If the client is not there anymore it returns `true` to unregister the
autocommand
This fix the
`method textDocument/documentHighlight is not supported by any of the servers registered for the current buffer`
errors when doing a LspRestart or the server crashes
* Delete the highlight autocommands in the LspDetatch event
* Only delete autocmds for the current buffer with the group name
* Simplify clearing the autocommands
---------
Co-authored-by: Francis Belanger
---
init.lua | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/init.lua b/init.lua
index 256da5b8..ccca32c8 100644
--- a/init.lua
+++ b/init.lua
@@ -514,13 +514,16 @@ require('lazy').setup({
-- When you move your cursor, the highlights will be cleared (the second autocommand).
local client = vim.lsp.get_client_by_id(event.data.client_id)
if client and client.server_capabilities.documentHighlightProvider then
+ local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = true })
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
buffer = event.buf,
+ group = highlight_augroup,
callback = vim.lsp.buf.document_highlight,
})
vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
buffer = event.buf,
+ group = highlight_augroup,
callback = vim.lsp.buf.clear_references,
})
end
@@ -537,6 +540,14 @@ require('lazy').setup({
end,
})
+ vim.api.nvim_create_autocmd('LspDetach', {
+ group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
+ callback = function(event)
+ vim.lsp.buf.clear_references()
+ vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event.buf }
+ end,
+ })
+
-- LSP servers and clients are able to communicate to each other what features they support.
-- By default, Neovim doesn't support everything that is in the LSP specification.
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
From 942b26184c06f7fbeb276f3df0a829f02a752657 Mon Sep 17 00:00:00 2001
From: Francis Belanger
Date: Mon, 22 Apr 2024 15:53:45 -0400
Subject: [PATCH 14/15] fix: highlight group clear on each attach (#874)
---
init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index ccca32c8..036eefb8 100644
--- a/init.lua
+++ b/init.lua
@@ -514,7 +514,7 @@ require('lazy').setup({
-- When you move your cursor, the highlights will be cleared (the second autocommand).
local client = vim.lsp.get_client_by_id(event.data.client_id)
if client and client.server_capabilities.documentHighlightProvider then
- local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = true })
+ local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
buffer = event.buf,
group = highlight_augroup,
From 8df3deb6fe7d8adf6957bc649b171f0ffde7f1ad Mon Sep 17 00:00:00 2001
From: Adolfo Gante
Date: Mon, 22 Apr 2024 14:15:42 -0700
Subject: [PATCH 15/15] Update README.md (#875)
Line 102. Placed 'also' before the 'includes'.
"That includes also examples of adding popularly requested plugins." ---> "That also includes examples of adding popularly requested plugins."
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index dd51f209..be313bdb 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
current plugin status. Hit `q` to close the window.
Read through the `init.lua` file in your configuration folder for more
-information about extending and exploring Neovim. That includes also
+information about extending and exploring Neovim. That also includes
examples of adding popularly requested plugins.