From feeecbe936d0ac72b25da2d9c63e62463c18aebe Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 30 Jan 2023 14:47:53 +0000
Subject: [PATCH] Switch python linting back to pylsp

---
 config/nvim/lua/config_plugins/config_lsp.lua | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/config/nvim/lua/config_plugins/config_lsp.lua b/config/nvim/lua/config_plugins/config_lsp.lua
index c97f2c0a..de8c625c 100644
--- a/config/nvim/lua/config_plugins/config_lsp.lua
+++ b/config/nvim/lua/config_plugins/config_lsp.lua
@@ -121,27 +121,24 @@ cmp.setup.cmdline(':', {
 -- Setup lspconfig.
 local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
-require('lspconfig')['pyright'].setup {
+require('lspconfig')['pylsp'].setup {
     on_attach = on_attach,
     flags = lsp_flags,
     capabilities = capabilities,
-}
-
-require('lspconfig')['efm'].setup {
-    init_options = { documentFormatting = true },
     settings = {
-        languages = {
-            python = {
-                { formatCommand = 'black --quiet -', formatStdin = true },
-                { formatCommand = 'zimports -', formatStdin = true },
-                { formatCommand = 'isort --quiet -', formatStdin = true },
+        pylsp = {
+            plugins = {
+                pycodestyle = {
+                    maxLineLength = 88
+                },
+                mypy = {
+                    live_mode = false,
+                    dmypy = true,
+                    report_progress = true,
+                },
             },
         },
     },
-    filetypes = { 'python' },
-    on_attach = on_attach,
-    flags = lsp_flags,
-    capabilities = capabilities,
 }
 
 require('lspconfig')['fortls'].setup {