From b8d3bc0d4eb80e77a2696c1f5bd824a715c07595 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Sun, 14 Aug 2022 12:18:46 +0200
Subject: [PATCH] Use plugin for diagnosticls config

---
 .../neovim/files/lua/plugins/options/lsp.lua  | 32 ++++++++++++++-----
 roles/neovim/files/lua/plugins/packer.lua     |  1 +
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/roles/neovim/files/lua/plugins/options/lsp.lua b/roles/neovim/files/lua/plugins/options/lsp.lua
index fc6fc89..3e87ee0 100644
--- a/roles/neovim/files/lua/plugins/options/lsp.lua
+++ b/roles/neovim/files/lua/plugins/options/lsp.lua
@@ -12,29 +12,45 @@ local attach_fn = function()
   vim.keymap.set('n', '<leader>dl', '<cmd>Telescope diagnostics<CR>', { buffer = 0, remap = false })
 end
 
+local lspconfig = require'lspconfig'
 local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
 
 -- General purpose diagnostics
-require'lspconfig'.diagnosticls.setup {
+local diagnosticls = require'diagnosticls'
+lspconfig.diagnosticls.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
-  filetypes = { 'python' },
+  filetypes = {
+    'python',
+    unpack(diagnosticls.filetypes),
+  },
+  init_options = {
+    linters = vim.tbl_deep_extend("force", diagnosticls.linters, {
+    }),
+    formatters = diagnosticls.formatters,
+    filetypes = {
+      python = { 'flake8', 'mypy' },
+    },
+    formatFiletypes = {
+      python = { 'isort', 'black' },
+    }
+  },
 }
 
 -- Ansible
-require'lspconfig'.ansiblels.setup {
+lspconfig.ansiblels.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
 }
 
 -- Bash
-require'lspconfig'.bashls.setup {
+lspconfig.bashls.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
 }
 
 -- LaTeX
-require'lspconfig'.texlab.setup {
+lspconfig.texlab.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
   settings = {
@@ -48,7 +64,7 @@ require'lspconfig'.texlab.setup {
 }
 
 -- Lua
-require'lspconfig'.sumneko_lua.setup {
+lspconfig.sumneko_lua.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
   settings = {
@@ -75,13 +91,13 @@ require'lspconfig'.sumneko_lua.setup {
 }
 
 -- Markdown
-require'lspconfig'.marksman.setup {
+lspconfig.marksman.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
 }
 
 -- Python
-require'lspconfig'.jedi_language_server.setup {
+lspconfig.jedi_language_server.setup {
   capabilities = capabilities,
   on_attach = attach_fn,
 }
diff --git a/roles/neovim/files/lua/plugins/packer.lua b/roles/neovim/files/lua/plugins/packer.lua
index e9ee351..5bbb9cf 100644
--- a/roles/neovim/files/lua/plugins/packer.lua
+++ b/roles/neovim/files/lua/plugins/packer.lua
@@ -13,6 +13,7 @@ return require('packer').startup(function(use)
 
   -- Nvim LSP
   use 'neovim/nvim-lspconfig'
+  use 'lithammer/nvim-diagnosticls'
 
   -- Tree-sitter
   use {