commit - b15827171c43805afa6cdaa06d67900f6432a505
commit + ee9fa3b1d6f4fb7cddf0a468cf588bba29785265
blob - 29fe3d22b2b8ef225626711bd96b057d00de17d3
blob + 1e12b011a0d36819f55414f6cb0daba5d5860144
--- lua/plugins/lspconfig.lua
+++ lua/plugins/lspconfig.lua
@@ -52,11 +52,14 @@ return {
                     },
                 },
             }
-            local lspconfig = require('lspconfig')
             for server_name, server_config in pairs(servers) do
-                lspconfig[server_name].setup(vim.tbl_deep_extend('force', {
-                    capabilities = capabilities,
-                }, server_config))
+                vim.lsp.config(
+                    server_name,
+                    vim.tbl_deep_extend('force', {
+                        capabilities = capabilities,
+                    }, server_config)
+                )
+                vim.lsp.enable(server_name)
             end
         end,
     },
blob - f7cd623b1073d781930c9b8af042560d0e7630ca
blob + da0d894275b8984aeb18c81e6cf592675e7b0876
--- lua/plugins/mason.lua
+++ lua/plugins/mason.lua
@@ -8,16 +8,6 @@ return {
         opts = {
             ensure_installed = { 'lua_ls' },
             automatic_installation = false,
-            handlers = {
-                function(server_name)
-                    local server = servers[server_name] or {}
-                    -- This handles overriding only values explicitly passed
-                    -- by the server configuration above. Useful when disabling
-                    -- certain features of an LSP (for example, turning off formatting for ts_ls)
-                    server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-                    require('lspconfig')[server_name].setup(server)
-                end,
-            },
         },
     },
     {