chore(lsp): adjust formatters and servers

cfcosta · Sep 24, 2024 · 2ee274c · 2ee274c
1 parent 8123749
commit 2ee274c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 53 deletions.
diff --git a/plugins/conform/default.nix b/plugins/conform/default.nix
@@ -1,6 +1,7 @@
 {
   inputs,
   mkPlugin,
+  pkgs,
   ...
 }:
 let
@@ -14,5 +15,19 @@ mkPlugin {
     "lspconfig"
   ];
 
+  inputs = with pkgs; [
+    beancount
+    cmake-format
+    gofumpt
+    jq
+    nixfmt-rfc-style
+    ruff
+    shellcheck
+    shfmt
+    stylua
+    taplo
+    yq
+  ];
+
   config = readFile ./configuration.lua;
 }
diff --git a/plugins/lspconfig/configuration.lua b/plugins/lspconfig/configuration.lua
@@ -1,5 +1,4 @@
 local lspconfig = require("lspconfig")
-local util = require("lspconfig.util")
 
 ------------------------------------------------------------------
 -- Diagnostic Symbols
@@ -50,54 +49,19 @@ vim.api.nvim_set_keymap("n", "<leader>cr", "<cmd>lua vim.lsp.buf.rename()<CR>",
 ------------------------------------------------------------------
 lspconfig.aiken.setup({})
 lspconfig.bashls.setup({})
+lspconfig.beancount.setup({})
 lspconfig.bufls.setup({})
 lspconfig.clangd.setup({})
+lspconfig.docker_compose_language_server.setup({})
+lspconfig.dockerls.setup({})
+lspconfig.gopls.setup({})
+lspconfig.jq.setup({})
 lspconfig.nixd.setup({})
 lspconfig.postgres_lsp.setup({})
 lspconfig.postgres_lsp.setup({})
-
-------------------------------------------------------------------
--- Python
-------------------------------------------------------------------
-local root_files = {
-  "pyproject.toml",
-  "setup.py",
-  "setup.cfg",
-  "requirements.txt",
-  "Pipfile",
-  "pyrightconfig.json",
-  ".git",
-}
-
-lspconfig.pyright.setup({
-  default_config = {
-    cmd = { "pyright-langserver", "--stdio" },
-    filetypes = { "python" },
-    root_dir = function(fname)
-      return util.root_pattern(unpack(root_files))(fname)
-    end,
-    single_file_support = true,
-    settings = {
-      pyright = {
-        disableOrganizeImports = true,
-      },
-      python = {
-        analysis = {
-          autoSearchPaths = true,
-          useLibraryCodeForTypes = true,
-          diagnosticMode = "workspace",
-          autoImportCompletions = true,
-        },
-      },
-    },
-  },
-})
-
-lspconfig.ruff_lsp.setup({
-  on_attach = function(client, _)
-    client.server_capabilities.hoverProvider = false
-  end,
-})
+lspconfig.ruff.setup({})
+lspconfig.ruff_lsp.setup({})
+lspconfig.taplo.setup({})
 
 ------------------------------------------------------------------
 -- Lua

diff --git a/plugins/lspconfig/default.nix b/plugins/lspconfig/default.nix
@@ -13,23 +13,20 @@ mkPlugin {
   inputs = with pkgs; [
     aiken
     bash-language-server
+    beancount-language-server
     buf-language-server
+    cairo-lang
     clang-tools
-    cmake-format
+    docker-compose-language-service
+    dockerfile-language-server-nodejs
     gopls
-    jq
+    jq-lsp
     lua-language-server
-    luajitPackages.luacheck
     nixd
-    nixfmt-rfc-style
-    nodePackages.dockerfile-language-server-nodejs
-    nodePackages.vscode-langservers-extracted
     postgres-lsp
-    pyright
     ruff
     ruff-lsp
-    shellcheck
-    shfmt
+    taplo-lsp
   ];
 
   config = readFile ./configuration.lua;