diff options
| author | Damjan 9000 <damjan.9000@gmail.com> | 2024-07-31 21:09:37 +0200 |
|---|---|---|
| committer | Damjan 9000 <damjan.9000@gmail.com> | 2024-07-31 21:09:37 +0200 |
| commit | 198460c421a29ea0d45280756ee462f51f71b60f (patch) | |
| tree | 9df3ef20b8abc656e29d7a0d5a694a3a7042607d | |
| parent | 0a274ab66ccfb78015843af500cba24f806a7e1b (diff) | |
| parent | 186018483039b20dc39d7991e4fb28090dd4750e (diff) | |
Merge 'upstream' nvim-lspconfig cmp-nvim-lsp, treesitter prefer_git
Add explicit dependency of nvim-lspconfig on cmp-nvim-lsp
Remove treesitter prefer_git option
| -rw-r--r-- | lua/kickstart/plugins/lspconfig.lua | 3 | ||||
| -rw-r--r-- | lua/kickstart/plugins/treesitter.lua | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index 57c15ec..bb1bb0d 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -25,6 +25,9 @@ return { -- Useful status updates for LSP. -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` { 'j-hui/fidget.nvim', opts = {} }, + + -- Allows extra capabilities provided by nvim-cmp + 'hrsh7th/cmp-nvim-lsp', }, config = function() -- Brief aside: **What is LSP?** diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua index 4db3b2c..d44dc75 100644 --- a/lua/kickstart/plugins/treesitter.lua +++ b/lua/kickstart/plugins/treesitter.lua @@ -18,8 +18,6 @@ return { config = function(_, opts) -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - -- Prefer git instead of curl in order to improve connectivity in some environments - require('nvim-treesitter.install').prefer_git = true ---@diagnostic disable-next-line: missing-fields require('nvim-treesitter.configs').setup(opts) |