Various fixes from upstream

lua/plugins/nvim-lspconfig.lua

@@ -10,6 +10,9 @@ return { -- LSP Configuration & Plugins
     -- 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', opts = {} },
+
     -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
     -- used for completion, annotations and signatures of Neovim apis
     { 'folke/lazydev.nvim', opts = {} },