diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 010dd9d..6268656 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -1,6 +1,6 @@
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
 
     config = function()
       require("mason").setup()
@@ -13,7 +13,8 @@ return {
       local mason_lspconfig = require("mason-lspconfig")
 
       mason_lspconfig.setup({
-        ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zls" }
+        ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zls" },
+        automatic_enable = true
       })
 
     end
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index a94c28c..2879b39 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -3,32 +3,22 @@ return {
 
   config = function()
     local lspconfig = require("lspconfig")
-    local mason_registry = require("mason-registry")
-    local volar_path = mason_registry.get_package("vue-language-server"):get_install_path() .. "/node_modules/@vue/language-server"
 
-    lspconfig.clangd.setup({
+    vim.lsp.config("clangd", {
       cmd = { "clangd", "-header-insertion=never" },
     })
-    lspconfig.lua_ls.setup({})
-    lspconfig.matlab_ls.setup({})
-    lspconfig.mesonlsp.setup({})
-    lspconfig.sqlls.setup({})
-    lspconfig.svlangserver.setup({})
-    lspconfig.texlab.setup({})
 
-    lspconfig.ts_ls.setup({
+    vim.lsp.config("ts_ls", {
       init_options = {
         plugins = {
           {
             name = "@vue/typescript-plugin",
-            location = volar_path,
+            location = vim.fn.expand("$MASON") .. "/packages/vue-language-server/node_modules/@vue/language-server",
             languages = { "vue" },
           },
         },
       },
       filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
     })
-    lspconfig.volar.setup({})
-    lspconfig.zig.setup({})
   end
 }