Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						5024bc0094
					
				|  | @ -24,6 +24,7 @@ If you are experiencing issues, please make sure you have the latest versions. | ||||||
| External Requirements: | External Requirements: | ||||||
| - Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`) | - Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`) | ||||||
| - [ripgrep](https://github.com/BurntSushi/ripgrep#installation) | - [ripgrep](https://github.com/BurntSushi/ripgrep#installation) | ||||||
|  | - Clipboard tool (xclip/xsel/win32yank or other depending on platform) | ||||||
| - A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons | - A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons | ||||||
|   - if you have it set `vim.g.have_nerd_font` in `init.lua` to true |   - if you have it set `vim.g.have_nerd_font` in `init.lua` to true | ||||||
| - Language Setup: | - Language Setup: | ||||||
|  | @ -182,7 +183,7 @@ wsl --install | ||||||
| wsl | wsl | ||||||
| sudo add-apt-repository ppa:neovim-ppa/unstable -y | sudo add-apt-repository ppa:neovim-ppa/unstable -y | ||||||
| sudo apt update | sudo apt update | ||||||
| sudo apt install make gcc ripgrep unzip neovim | sudo apt install make gcc ripgrep unzip git xclip neovim | ||||||
| ``` | ``` | ||||||
| </details> | </details> | ||||||
| 
 | 
 | ||||||
|  | @ -192,14 +193,14 @@ sudo apt install make gcc ripgrep unzip neovim | ||||||
| ``` | ``` | ||||||
| sudo add-apt-repository ppa:neovim-ppa/unstable -y | sudo add-apt-repository ppa:neovim-ppa/unstable -y | ||||||
| sudo apt update | sudo apt update | ||||||
| sudo apt install make gcc ripgrep unzip git neovim | sudo apt install make gcc ripgrep unzip git xclip neovim | ||||||
| ``` | ``` | ||||||
| </details> | </details> | ||||||
| <details><summary>Debian Install Steps</summary> | <details><summary>Debian Install Steps</summary> | ||||||
| 
 | 
 | ||||||
| ``` | ``` | ||||||
| sudo apt update | sudo apt update | ||||||
| sudo apt install make gcc ripgrep unzip git curl | sudo apt install make gcc ripgrep unzip git xclip curl | ||||||
| 
 | 
 | ||||||
| # Now we install nvim | # Now we install nvim | ||||||
| curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz | curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz | ||||||
|  |  | ||||||
							
								
								
									
										18
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										18
									
								
								init.lua
								
								
								
								
							|  | @ -526,6 +526,14 @@ require('lazy').setup({ | ||||||
|               group = highlight_augroup, |               group = highlight_augroup, | ||||||
|               callback = vim.lsp.buf.clear_references, |               callback = vim.lsp.buf.clear_references, | ||||||
|             }) |             }) | ||||||
|  | 
 | ||||||
|  |             vim.api.nvim_create_autocmd('LspDetach', { | ||||||
|  |               group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), | ||||||
|  |               callback = function(event2) | ||||||
|  |                 vim.lsp.buf.clear_references() | ||||||
|  |                 vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } | ||||||
|  |               end, | ||||||
|  |             }) | ||||||
|           end |           end | ||||||
| 
 | 
 | ||||||
|           -- The following autocommand is used to enable inlay hints in your |           -- The following autocommand is used to enable inlay hints in your | ||||||
|  | @ -540,14 +548,6 @@ require('lazy').setup({ | ||||||
|         end, |         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. |       -- 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. |       --  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. |       --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. | ||||||
|  | @ -836,7 +836,7 @@ require('lazy').setup({ | ||||||
|     'nvim-treesitter/nvim-treesitter', |     'nvim-treesitter/nvim-treesitter', | ||||||
|     build = ':TSUpdate', |     build = ':TSUpdate', | ||||||
|     opts = { |     opts = { | ||||||
|       ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, |       ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, | ||||||
|       -- Autoinstall languages that are not installed |       -- Autoinstall languages that are not installed | ||||||
|       auto_install = true, |       auto_install = true, | ||||||
|       highlight = { |       highlight = { | ||||||
|  |  | ||||||
|  | @ -31,7 +31,7 @@ return { | ||||||
|     require('mason-nvim-dap').setup { |     require('mason-nvim-dap').setup { | ||||||
|       -- Makes a best effort to setup the various debuggers with |       -- Makes a best effort to setup the various debuggers with | ||||||
|       -- reasonable debug configurations |       -- reasonable debug configurations | ||||||
|       automatic_setup = true, |       automatic_installation = true, | ||||||
| 
 | 
 | ||||||
|       -- You can provide additional configuration to the handlers, |       -- You can provide additional configuration to the handlers, | ||||||
|       -- see mason-nvim-dap README for more information |       -- see mason-nvim-dap README for more information | ||||||
|  | @ -85,6 +85,12 @@ return { | ||||||
|     dap.listeners.before.event_exited['dapui_config'] = dapui.close |     dap.listeners.before.event_exited['dapui_config'] = dapui.close | ||||||
| 
 | 
 | ||||||
|     -- Install golang specific config |     -- Install golang specific config | ||||||
|     require('dap-go').setup() |     require('dap-go').setup { | ||||||
|  |       delve = { | ||||||
|  |         -- On Windows delve must be run attached or it crashes. | ||||||
|  |         -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring | ||||||
|  |         detached = vim.fn.has 'win32' == 0, | ||||||
|  |       }, | ||||||
|  |     } | ||||||
|   end, |   end, | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue