From 91cd533c283511134d6be09fee0d82866764e936 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 5 Dec 2023 14:38:07 -0500 Subject: [PATCH] neovim: Fix nvim-cmp usage with denols/tsserver This commit removes the duplicate setup {} commands. It also fixes typst being set up without its respective settings. --- home/neovim.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/home/neovim.nix b/home/neovim.nix index 1be0dd58..884a186c 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -234,26 +234,18 @@ in type = "lua"; config = /* lua */ '' local lspconfig = require('lspconfig') - lspconfig.nil_ls.setup {} - lspconfig.rust_analyzer.setup {} - lspconfig.marksman.setup {} - lspconfig.gopls.setup {} - lspconfig.lua_ls.setup {} - lspconfig.clangd.setup {} - lspconfig.texlab.setup {} - lspconfig.crystalline.setup {} - lspconfig.prismals.setup {} - lspconfig.tailwindcss.setup {} - lspconfig.emmet_language_server.setup {} + local capabilities = require("cmp_nvim_lsp").default_capabilities() lspconfig.denols.setup { + capabilities = capabilities, root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc"), } lspconfig.tsserver.setup { + capabilities = capabilities, root_dir = lspconfig.util.root_pattern("package.json"), single_file_support = false } - lspconfig.astro.setup {} lspconfig.typst_lsp.setup { + capabilities = capabilities, settings = { exportPdf = "onSave" } @@ -301,9 +293,7 @@ in 'prismals', 'tailwindcss', 'emmet_language_server', - 'tsserver', 'astro', - 'typst_lsp' } for _, lsp in ipairs(servers) do