lua/lsp/init.lua

@@ -62,6 +62,12 @@ vim.lsp.config['lua_ls'] = {
 
 vim.lsp.enable('lua_ls')
 
+vim.lsp.config['ts_ls'] = {
+    -- capabilities = capabilities,
+    on_attach = on_attach,
+}
+vim.lsp.enable('ts_ls')
+
 vim.lsp.config['pyright'] = {
     -- capabilities = capabilities,
     on_attach = on_attach,
@@ -80,45 +86,9 @@ vim.lsp.config['clangd'] = {
 }
 vim.lsp.enable('clangd')
 
-local tsserver_filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }
-local global_node_modules = vim.fn.system("npm root -g"):gsub("%s+", "")
-local vue_language_server_path = global_node_modules .. '/@vue/language-server'
-
-local vue_plugin = {
-    name = '@vue/typescript-plugin',
-    location = vue_language_server_path,
-    languages = { 'vue' },
-    configNamespace = 'typescript',
-}
-
-vim.lsp.config['ts_ls'] = {
-    init_options = {
-        plugins = {
-            vue_plugin,
-        },
-    },
-    filetypes = tsserver_filetypes,
-    on_attach = on_attach,
-}
-
-vim.lsp.config['vtsls'] = {
-    on_attach = on_attach,
-    settings = {
-        vtsls = {
-            tsserver = {
-                globalPlugins = {
-                    vue_plugin,
-                },
-            },
-        },
-    },
-    filetypes = tsserver_filetypes,
-}
-
-
-vim.lsp.config['vue_ls'] = {
-    filetypes = tsserver_filetypes,
+vim.lsp.config['volar'] = {
+    filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' },
     -- capabilities = capabilities,
     on_attach = on_attach,
 }
-vim.lsp.enable({ 'vtsls', 'vue_ls' })
+vim.lsp.enable('volar')

lua/plugins/treesitter.lua

@@ -11,19 +11,10 @@ vim.api.nvim_create_autocmd('PackChanged', {
     end
 })
 
-vim.api.nvim_create_autocmd('FileType', {
-    callback = function()
-        -- Enable treesitter highlighting and disable regex syntax
-        pcall(vim.treesitter.start)
-        -- Enable treesitter-based indentation
-        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-    end,
-})
-
 vim.pack.add({
-    { src = 'https://github.com/nvim-treesitter/nvim-treesitter',             name = 'treesitter',             branch = 'main' },
+    { src = 'https://github.com/nvim-treesitter/nvim-treesitter',             name = 'treesitter',            branch = 'main' },
     { src = 'https://github.com/nvim-treesitter/nvim-treesitter-context',     name = 'treesitter-context' },
-    { src = 'https://github.com/nvim-treesitter/nvim-treesitter-textobjects', name = 'treesitter-textobjects', branch = 'main' },
+    { src = 'https://github.com/nvim-treesitter/nvim-treesitter-textobjects', name = 'treesitter-textobjects' },
 })
 
 require("nvim-treesitter").setup()

nvim-pack-lock.json

@@ -14,7 +14,7 @@
       "version": "1.0.0 - 2.0.0"
     },
     "conform.nvim": {
-      "rev": "dca1a190aa85f9065979ef35802fb77131911106",
+      "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "friendly-snippets": {
@@ -26,11 +26,11 @@
       "src": "https://github.com/tpope/vim-fugitive"
     },
     "gitsigns": {
-      "rev": "6d808f99bd63303646794406e270bd553ad7792e",
+      "rev": "8d82c240f190fc33723d48c308ccc1ed8baad69d",
       "src": "https://github.com/lewis6991/gitsigns.nvim"
     },
     "nvim-lspconfig": {
-      "rev": "31026a13eefb20681124706a79fc1df6bf11ab27",
+      "rev": "4b7fbaa239c5db6b36f424a4521ca9f1a401be33",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
     "plenary": {
@@ -38,7 +38,7 @@
       "src": "https://github.com/nvim-lua/plenary.nvim"
     },
     "telescope": {
-      "rev": "506338434fec5ad19cb1f8d45bf92d66c4917393",
+      "rev": "471eebb1037899fd942cc0f52c012f8773505da1",
       "src": "https://github.com/nvim-telescope/telescope.nvim"
     },
     "tokyonight": {