diff --git a/nvim/lua/my/lsp.lua b/nvim/lua/my/lsp.lua index ac05172..e6529c8 100644 --- a/nvim/lua/my/lsp.lua +++ b/nvim/lua/my/lsp.lua @@ -13,10 +13,10 @@ end local has_lsp_format, lsp_format = pcall(require, "lsp-format") if has_lsp_format then lsp_format.setup { - typescript = { exclude = { "tsserver" } }, - javascript = { exclude = { "tsserver" } }, - typescriptreact = { exclude = { "tsserver" } }, - javascriptreact = { exclude = { "tsserver" } }, + typescript = { exclude = { "ts_ls" } }, + javascript = { exclude = { "ts_ls" } }, + typescriptreact = { exclude = { "ts_ls" } }, + javascriptreact = { exclude = { "ts_ls" } }, } end @@ -150,7 +150,7 @@ local servers = { cmd = { "lexical" }, }, gleam = {}, - tsserver = { + ts_ls = { root_dir = function(filename, _) local deno = lspconfig.util.root_pattern("deno.json", "deno.jsonc")(filename) if deno then diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index 021c7e2..66f4c05 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -44,25 +44,25 @@ return { require "mini.bufremove".setup() end }, - { - "yetone/avante.nvim", - event = "VeryLazy", - build = "make BUILD_FROM_SOURCE=true luajit", - opts = { - -- add any opts here - }, - dependencies = { - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - --- The below is optional, make sure to setup it properly if you have lazy=true - { - 'MeanderingProgrammer/render-markdown.nvim', - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, - }, - }, - } + -- { + -- "yetone/avante.nvim", + -- event = "VeryLazy", + -- build = "make BUILD_FROM_SOURCE=true luajit", + -- opts = { + -- -- add any opts here + -- }, + -- dependencies = { + -- "stevearc/dressing.nvim", + -- "nvim-lua/plenary.nvim", + -- "MunifTanjim/nui.nvim", + -- --- The below is optional, make sure to setup it properly if you have lazy=true + -- { + -- 'MeanderingProgrammer/render-markdown.nvim', + -- opts = { + -- file_types = { "markdown", "Avante" }, + -- }, + -- ft = { "markdown", "Avante" }, + -- }, + -- }, + -- } }