Skip to content

Commit 0b495cc

Browse files
authored
Merge branch 'nvim-lua:master' into master
2 parents 0092e4b + 5aeddfd commit 0b495cc

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ If you are experiencing issues, please make sure you have the latest versions.
2424
External Requirements:
2525
- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
2626
- [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
27+
- Clipboard tool (xclip/xsel/win32yank or other depending on platform)
2728
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
2829
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
2930
- Language Setup:
@@ -182,7 +183,7 @@ wsl --install
182183
wsl
183184
sudo add-apt-repository ppa:neovim-ppa/unstable -y
184185
sudo apt update
185-
sudo apt install make gcc ripgrep unzip neovim
186+
sudo apt install make gcc ripgrep unzip git xclip neovim
186187
```
187188
</details>
188189

@@ -192,14 +193,14 @@ sudo apt install make gcc ripgrep unzip neovim
192193
```
193194
sudo add-apt-repository ppa:neovim-ppa/unstable -y
194195
sudo apt update
195-
sudo apt install make gcc ripgrep unzip git neovim
196+
sudo apt install make gcc ripgrep unzip git xclip neovim
196197
```
197198
</details>
198199
<details><summary>Debian Install Steps</summary>
199200

200201
```
201202
sudo apt update
202-
sudo apt install make gcc ripgrep unzip git curl
203+
sudo apt install make gcc ripgrep unzip git xclip curl
203204
204205
# Now we install nvim
205206
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz

init.lua

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,14 @@ require('lazy').setup({
530530
group = highlight_augroup,
531531
callback = vim.lsp.buf.clear_references,
532532
})
533+
534+
vim.api.nvim_create_autocmd('LspDetach', {
535+
group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
536+
callback = function(event2)
537+
vim.lsp.buf.clear_references()
538+
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
539+
end,
540+
})
533541
end
534542

535543
-- The following autocommand is used to enable inlay hints in your
@@ -544,14 +552,6 @@ require('lazy').setup({
544552
end,
545553
})
546554

547-
vim.api.nvim_create_autocmd('LspDetach', {
548-
group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
549-
callback = function(event)
550-
vim.lsp.buf.clear_references()
551-
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event.buf }
552-
end,
553-
})
554-
555555
-- LSP servers and clients are able to communicate to each other what features they support.
556556
-- By default, Neovim doesn't support everything that is in the LSP specification.
557557
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
@@ -851,7 +851,7 @@ require('lazy').setup({
851851
'nvim-treesitter/nvim-treesitter',
852852
build = ':TSUpdate',
853853
opts = {
854-
ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
854+
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
855855
-- Autoinstall languages that are not installed
856856
auto_install = true,
857857
highlight = {

lua/kickstart/plugins/debug.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ return {
3131
require('mason-nvim-dap').setup {
3232
-- Makes a best effort to setup the various debuggers with
3333
-- reasonable debug configurations
34-
automatic_setup = true,
34+
automatic_installation = true,
3535

3636
-- You can provide additional configuration to the handlers,
3737
-- see mason-nvim-dap README for more information
@@ -85,6 +85,12 @@ return {
8585
dap.listeners.before.event_exited['dapui_config'] = dapui.close
8686

8787
-- Install golang specific config
88-
require('dap-go').setup()
88+
require('dap-go').setup {
89+
delve = {
90+
-- On Windows delve must be run attached or it crashes.
91+
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
92+
detached = vim.fn.has 'win32' == 0,
93+
},
94+
}
8995
end,
9096
}

0 commit comments

Comments
 (0)