Updates to lang stuff

1 files changed, 39 insertions, 35 deletions

diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua
index 09eb8d7..fe8d857 100644
--- a/.config/nvim/ftplugin/python.lua
+++ b/.config/nvim/ftplugin/python.lua
@@ -20,46 +20,50 @@ if O.lang.python.isort then
   table.insert(python_arguments, isort)
 end
 
-require("lspconfig").efm.setup {
-  -- init_options = {initializationOptions},
-  cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" },
-  init_options = { documentFormatting = true, codeAction = false },
-  filetypes = { "python" },
-  settings = {
-    rootMarkers = { ".git/", "requirements.txt" },
-    languages = {
-      python = python_arguments,
+if not require("cfg.utils").check_lsp_client_active "efm" then
+  require("lspconfig").efm.setup {
+    -- init_options = {initializationOptions},
+    cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" },
+    init_options = { documentFormatting = true, codeAction = false },
+    filetypes = { "python" },
+    settings = {
+      rootMarkers = { ".git/", "requirements.txt" },
+      languages = {
+        python = python_arguments,
+      },
     },
-  },
-}
+  }
+end
 
--- npm i -g pyright
-require("lspconfig").pyright.setup {
-  cmd = {
-    DATA_PATH .. "/lspinstall/python/node_modules/.bin/pyright-langserver",
-    "--stdio",
-  },
-  on_attach = require("cfg.lsp").common_on_attach,
-  handlers = {
-    ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-      virtual_text = O.lang.python.diagnostics.virtual_text,
-      signs = O.lang.python.diagnostics.signs,
-      underline = O.lang.python.diagnostics.underline,
-      update_in_insert = true,
-    }),
-  },
-  settings = {
-    python = {
-      analysis = {
-        typeCheckingMode = O.lang.python.analysis.type_checking,
-        autoSearchPaths = O.lang.python.analysis.auto_search_paths,
-        useLibraryCodeForTypes = O.lang.python.analysis.use_library_code_types,
+if not require("cfg.utils").check_lsp_client_active "pyright" then
+  -- npm i -g pyright
+  require("lspconfig").pyright.setup {
+    cmd = {
+      DATA_PATH .. "/lspinstall/python/node_modules/.bin/pyright-langserver",
+      "--stdio",
+    },
+    on_attach = require("cfg.lsp").common_on_attach,
+    handlers = {
+      ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
+        virtual_text = O.lang.python.diagnostics.virtual_text,
+        signs = O.lang.python.diagnostics.signs,
+        underline = O.lang.python.diagnostics.underline,
+        update_in_insert = true,
+      }),
+    },
+    settings = {
+      python = {
+        analysis = {
+          typeCheckingMode = O.lang.python.analysis.type_checking,
+          autoSearchPaths = O.lang.python.analysis.auto_search_paths,
+          useLibraryCodeForTypes = O.lang.python.analysis.use_library_code_types,
+        },
       },
     },
-  },
-}
+  }
+end
 
 if O.plugin.debug.active and O.plugin.dap_install.active then
-  local dap_install = require("dap-install")
+  local dap_install = require "dap-install"
   dap_install.config("python_dbg", {})
 end