Done

init.lua

@@ -337,8 +337,7 @@ lazy.setup({
     "neovim/nvim-lspconfig",
     event = { "BufReadPre", "BufNewFile" },
     config = function()
-      require('lspconfig').lua_ls.setup({})
+      V.lsp.enable('lua_ls', 'powershell_es')
-      require("lspconfig").powershell_es.setup({})
 
       -- The default borders from nvim-lspconfig, which is what is used to configure the lsp servers
       -- in this configuration, are not visible. This is a workaround to update the borders key in the
@@ -359,24 +358,10 @@ lazy.setup({
       }
 
       -- RUST --
-      local handlers = {
+      V.lsp.enable('rust_analyzer')
-        ["textDocument/hover"] = V.lsp.with(V.lsp.handlers.hover, { border = border }),
-        ["textDocument/signatureHelp"] = V.lsp.with(V.lsp.handlers.signature_help, { border = border }),
-      }
-      require("lspconfig").rust_analyzer.setup({ handlers = handlers })
 
       -- C# --
-      local omnisharp_extended = require("omnisharp_extended") -- decompilation support
+      V.lsp.config('omnisharp', {
-      local omnisharp_handlers = {
-        ["textDocument/hover"] = V.lsp.with(V.lsp.handlers.hover, { border = border }),
-        ["textDocument/signatureHelp"] = V.lsp.with(V.lsp.handlers.signature_help, { border = border }),
-        ["textDocument/definition"] = omnisharp_extended.definition_handler,
-        ["textDocument/references"] = omnisharp_extended.references_handler,
-        ["textDocument/implementation"] = omnisharp_extended.implementation_handler,
-      }
-
-      require("lspconfig").omnisharp.setup({
-        handlers = omnisharp_handlers,
         enable_editorconfig_support = true,
         enable_ms_build_load_projects_on_demand = false,
         enable_roslyn_analyzers = true,
@@ -385,6 +370,7 @@ lazy.setup({
         sdk_include_prereleases = true,
         analyze_open_documents_only = true,
       })
+      V.lsp.enable('omnisharp')
 
       -- Add default LSP keybindings
       V.api.nvim_create_autocmd('LspAttach', {
@@ -605,7 +591,7 @@ lazy.setup({
   -- Treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    branch = 'master',
+    branch = 'main',
     lazy = false,
     build = ":TSUpdate",
     opts_extend = { "ensure_installed" },