diff --git a/neovim/default.nix b/neovim/default.nix index faf5955..27d17a3 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -98,17 +98,11 @@ extraPackages = with pkgs; [ # language servers lua-language-server - terraform-ls - tflint bash-language-server prettierd nodePackages.yaml-language-server - nodePackages.eslint_d - nodePackages.typescript-language-server - nodePackages.typescript nodePackages.dockerfile-language-server-nodejs nodePackages.vscode-langservers-extracted - vscode-extensions.vue.volar lldb vscode-extensions.vadimcn.vscode-lldb marksman @@ -123,7 +117,6 @@ autopep8 python-lsp-server ])) - pyright #clipboard xclip diff --git a/neovim/lspconfig.lua b/neovim/lspconfig.lua index db4b8a4..ea85b43 100644 --- a/neovim/lspconfig.lua +++ b/neovim/lspconfig.lua @@ -9,9 +9,6 @@ local on_attach = function(client, bufnr) vim.lsp.buf.format({ timeout_ms = 3000, async = false, - filter = function(formatter) - return formatter.name ~= "tsserver" and formatter.name ~= "volar" - end }) end @@ -73,7 +70,6 @@ local servers = { ["clangd"] = {}, ["cmake"] = {}, ["dockerls"] = {}, - ["eslint"] = {}, ["html"] = {}, ["jsonls"] = {}, ["lua_ls"] = { @@ -117,11 +113,7 @@ local servers = { } } }, - ["pyright"] = {}, - ["terraformls"] = {}, ["texlab"] = {}, - ["tflint"] = {}, - ["tsserver"] = {}, ["yamlls"] = { yaml = { keyOrdering = false @@ -192,10 +184,3 @@ for type, icon in pairs(diagnostics_signs) do local hl = "DiagnosticSign" .. type vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl }) end - --- setup volar -lspconfig["volar"].setup({ - filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' }, - on_attach = on_attach, - capabilities = capabilities, -})