Move ciderlsp to a local configuration so it does not pollute my personal machines

1 files changed, 7 insertions, 17 deletions

diff --git a/lua/lsp.lua b/lua/lsp.lua
index ac086e4..12e9b9a 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -6,14 +6,6 @@ local vim = assert(vim)
 -- To list all filetype names, see https://vi.stackexchange.com/a/14990
 local nvim_lsp = require("lspconfig")
 local configs = require("lspconfig.configs")
-configs.ciderlsp = {
-  default_config = {
-    cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "-merge_diagnostic_layers=true", "-tooltag=nvim-cmp" },
-    filetypes = { "java", "kotlin", "objc", "proto", "textproto", "go", "python", "BUILD" },
-    root_dir = nvim_lsp.util.root_pattern("BUILD"),
-    settings = {},
-  },
-}
 
 configs.lualsp = {
   default_config = {
@@ -149,8 +141,9 @@ vim.cmd([[
   augroup END
 ]])
 
+local M = {}
 -- 3. Set up CiderLSP
-local on_attach = function(client, bufnr)
+M.on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
   if vim.lsp.formatexpr then -- Neovim v0.6.0+ only.
     vim.api.nvim_buf_set_option(bufnr, "formatexpr", "v:lua.vim.lsp.formatexpr")
@@ -184,25 +177,22 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_command("augroup END")
 end
 
-nvim_lsp.ciderlsp.setup({
-  capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
-  on_attach = on_attach,
-})
-
 nvim_lsp.lualsp.setup({
   capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
-  on_attach = on_attach,
+  on_attach = M.on_attach,
 })
 
 nvim_lsp.clangd.setup({
   capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
-  on_attach = on_attach,
+  on_attach = M.on_attach,
 })
 
 nvim_lsp.hls.setup({
   capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
-  on_attach = on_attach,
+  on_attach = M.on_attach,
 })
 
 vim.cmd[[hi DiagnosticUnderlineError gui=undercurl guisp=salmon]]
 vim.cmd[[hi DiagnosticUnderlineWarn gui=undercurl guisp=gold]]
+
+return M