diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix
index 212f6be..c078352 100644
--- a/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
@@ -34,7 +34,7 @@
       nixfmt-rfc-style
 
       # TypeScript
-      (callPackage ../vtsls/package.nix { })
+      typescript-language-server
 
       # Rust
       rust-analyzer
@@ -42,7 +42,7 @@
       vscode-extensions.vadimcn.vscode-lldb.adapter
 
       # Vue
-      vscode-extensions.vue.volar
+      vue-language-server
 
       # Svelte
       nodePackages.svelte-language-server
diff --git a/programs/neovim/lua/plugins/astrolsp.lua b/programs/neovim/lua/plugins/astrolsp.lua
index 7c28eb8..91af45e 100644
--- a/programs/neovim/lua/plugins/astrolsp.lua
+++ b/programs/neovim/lua/plugins/astrolsp.lua
@@ -60,7 +60,7 @@ return {
       "svelte",
       "taplo",
       "volar",
-      "vtsls",
+      "tsserver",
       "yamlls",
     },
     -- customize language server configuration options passed to `lspconfig`
@@ -72,7 +72,7 @@ return {
           nixd = {
             options = {
               nixos = {
-                expr = '(builtins.getFlake ("git+file:///home/wizardlink/.system")).nixosConfigurations.nixos.options',
+                expr = '(builtins.getFlake ("git+file:///home/wizardlink/.system")).nixosConfigurations.wizdesk.options',
               },
               home_manager = {
                 expr =
@@ -82,6 +82,22 @@ return {
           },
         },
       },
+      tsserver = {
+        init_options = {
+          plugins = {
+            {
+              name = "@vue/typescript-plugin",
+              location = {}, -- Means we need @vue/typescript-plugin in node_modules
+              languages = { "javascript", "typescript", "vue" },
+            },
+          },
+        },
+        filetypes = {
+          "javascript",
+          "typescript",
+          "vue",
+        },
+      },
     },
     -- customize how language servers are attached
     handlers = {