From 649bf7b8ce81894d62f5d15eb216af95c157b106 Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Sat, 19 Jul 2025 13:17:27 +0100
Subject: [PATCH 1/6] refactor(nvim): replace none-ls with null-ls

---
 nvim/lua/lsp/init.lua                             | 2 +-
 nvim/lua/lsp/servers/{null_ls.lua => none_ls.lua} | 0
 nvim/lua/plugins/init.lua                         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename nvim/lua/lsp/servers/{null_ls.lua => none_ls.lua} (100%)

diff --git a/nvim/lua/lsp/init.lua b/nvim/lua/lsp/init.lua
index 1ec443b..a17a45a 100644
--- a/nvim/lua/lsp/init.lua
+++ b/nvim/lua/lsp/init.lua
@@ -70,7 +70,7 @@ local servers = {
   'jsonls',
   'lemminx',
   'lua_ls',
-  'null_ls',
+  'none_ls',
   'pyright',
   'rust_analyzer',
   'stylelint_lsp',
diff --git a/nvim/lua/lsp/servers/null_ls.lua b/nvim/lua/lsp/servers/none_ls.lua
similarity index 100%
rename from nvim/lua/lsp/servers/null_ls.lua
rename to nvim/lua/lsp/servers/none_ls.lua
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 40ff6a8..a8f6d60 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -144,7 +144,7 @@ require('lazy').setup({
     'folke/neodev.nvim',
     'neovim/nvim-lspconfig',
     {
-      'jose-elias-alvarez/null-ls.nvim',
+      'nvimtools/none-ls.nvim',
       dependencies = {
         'nvim-lua/plenary.nvim',
       },

From 02d490ccd0da5fecf934cd5b3b02d0966358b389 Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Sat, 19 Jul 2025 13:59:43 +0100
Subject: [PATCH 2/6] fix(nvim): get `eslint_d` working

---
 nvim/lua/lsp/servers/none_ls.lua | 13 ++++++-------
 nvim/lua/plugins/init.lua        |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nvim/lua/lsp/servers/none_ls.lua b/nvim/lua/lsp/servers/none_ls.lua
index 7c56b02..95f274e 100644
--- a/nvim/lua/lsp/servers/none_ls.lua
+++ b/nvim/lua/lsp/servers/none_ls.lua
@@ -9,27 +9,26 @@ end
 
 local formatting = plugin.builtins.formatting
 local diagnostics = plugin.builtins.diagnostics
-local code_actions = plugin.builtins.code_actions
 
 _M.setup = function(on_attach)
   plugin.setup({
     debug = true,
     root_dir = require('null-ls.utils').root_pattern('.git', 'package.json', 'composer.json'),
     sources = {
-      code_actions.eslint_d,
-      code_actions.shellcheck,
+      require('none-ls.code_actions.eslint_d'),
+      -- code_actions.shellcheck,
 
       diagnostics.actionlint,
       -- diagnostics.ansiblelint,
-      diagnostics.chktex,
-      diagnostics.eslint_d,
+      -- diagnostics.chktex,
+      require('none-ls.diagnostics.eslint_d'),
       diagnostics.hadolint,
       diagnostics.markdownlint,
       diagnostics.phpcs.with({
         prefer_local = './vendor/bin',
       }),
       -- diagnostics.phpmd, -- FIX: doesn't work yet.
-      diagnostics.shellcheck,
+      -- diagnostics.shellcheck,
       diagnostics.stylelint.with({
         prefer_local = './node_modules/stylelint/bin',
       }),
@@ -38,7 +37,7 @@ _M.setup = function(on_attach)
       diagnostics.zsh,
 
       formatting.blade_formatter,
-      formatting.eslint_d,
+      require('none-ls.formatting.eslint_d'),
       formatting.gofmt,
       formatting.phpcbf.with({
         prefer_local = './vendor/bin',
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index a8f6d60..74b6502 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -146,6 +146,7 @@ require('lazy').setup({
     {
       'nvimtools/none-ls.nvim',
       dependencies = {
+        'nvimtools/none-ls-extras.nvim',
         'nvim-lua/plenary.nvim',
       },
     },

From 7f911a64d7ef9b48bcaef4bb9c85f3a75706fe3a Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Sat, 19 Jul 2025 14:00:05 +0100
Subject: [PATCH 3/6] chore(nvim): lua linting

---
 nvim/lua/plugins/init.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 74b6502..a0cd981 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -71,7 +71,7 @@ require('lazy').setup({
         'nvim-tree/nvim-web-devicons',
       },
       config = function()
-        require('lsp-progress').setup()
+        require('lsp-progress').setup({})
       end,
     },
     {
@@ -111,6 +111,7 @@ require('lazy').setup({
         local notify = require('notify')
         vim.notify = notify
         notify.setup({
+          merge_duplicates = false,
           background_colour = '#000000',
         })
       end,
@@ -248,7 +249,7 @@ require('lazy').setup({
             require('copilot_cmp').setup({
               method = 'getCompletionsCycling',
               format = {
-                before = function(entry, vim_item)
+                before = function(_, vim_item)
                   vim_item.kind = require('lspkind').presets.default[vim_item.kind] .. ' Copilot'
                   return vim_item
                 end,

From 664335dad8d4b5b71eb4593a0a6da1f80a729ea6 Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Sat, 19 Jul 2025 14:16:18 +0100
Subject: [PATCH 4/6] chore(git): sign home commits

---
 git/gitconfig           | 7 +++++++
 git/users/wsl.gitconfig | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 43b767a..4e84c28 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -1,6 +1,7 @@
 [user]
 	name = codepuncher
 	email = lee.hanbury@gmail.com
+	signingkey = ~/.ssh/id_ed25519.pub
 
 [filter "lfs"]
 	clean = git-lfs clean -- %f
@@ -23,6 +24,12 @@
 [init]
 	defaultBranch = main
 
+[gpg]
+	format = ssh
+
+[commit]
+	gpgsign = true
+
 [push]
 	autoSetupRemote = true
 
diff --git a/git/users/wsl.gitconfig b/git/users/wsl.gitconfig
index 4cf6bc2..68ac36a 100644
--- a/git/users/wsl.gitconfig
+++ b/git/users/wsl.gitconfig
@@ -1,17 +1,9 @@
 [user]
-	name = codepuncher
-	email = lee.hanbury@gmail.com
 	signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6lhgN8pvPgXJpgr8e4vo6k0nwP4mI8zgQcYMvePPBCNy8zZHS9BTKHPy/EdwNrCKX87uv0HcJeIztCShfmu7OjvasO6zgNzaNTOPxmelm7osBIuGYyZYih33ruT11eK8/RfeDh81OZGzMmez+Szk+oK1mb32rZvBPZpu2iGRFu0Yxx3jWtY+Kn8kwZX1GrfGEAfd29qoJiQli0Ma6YQhpioPgO7ybL8TCEvmkQPlCvHHpPhebwII8I2nZyGVpuIZsVleJW+fUroGOPDJ3xBcAs18YTMnQa/RDfUl0zsC6ZYa0MqnXUC6INBmNSk/hwLTmeVYDXau4DOLC8OpIaFkz
 
 [core]
 	pager = delta
 	sshCommand = ssh.exe
 
-[commit]
-	gpgsign = true
-
-[gpg]
-	format = ssh
-
 [gpg "ssh"]
 	program = "/mnt/c/Users/LeeHanbury-Pickett/AppData/Local/1Password/app/8/op-ssh-sign-wsl"

From 68dc2d55fdbc21ef56f87b4ca6679c4791c82fa3 Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Sat, 19 Jul 2025 16:21:35 +0100
Subject: [PATCH 5/6] feat(nvim): update LSP, formatting, keymap config

---
 nvim/lua/keymappings.lua         | 11 +++++
 nvim/lua/lsp/init.lua            | 78 ++++++++++----------------------
 nvim/lua/lsp/servers/bashls.lua  | 14 +-----
 nvim/lua/lsp/servers/lua_ls.lua  |  2 +-
 nvim/lua/lsp/servers/none_ls.lua |  9 ----
 nvim/lua/plugins/configs/cmp.lua |  1 +
 nvim/lua/plugins/init.lua        | 23 +++++++++-
 7 files changed, 59 insertions(+), 79 deletions(-)

diff --git a/nvim/lua/keymappings.lua b/nvim/lua/keymappings.lua
index dc59d9a..95d2c50 100644
--- a/nvim/lua/keymappings.lua
+++ b/nvim/lua/keymappings.lua
@@ -50,6 +50,17 @@ wk.register({
   ['ª'] = { '<Cmd>BufferLineGoToBuffer 9<cr>', '[BUFFER] Go to #9' },
   ['ç'] = { '<Cmd>Bdelete<cr>', '[BUFFER] Delete' },
 
+  -- LSP
+  ['<leader>ca'] = { '<cmd>Lspsaga code_action<CR>', '[LSP] Code Action' },
+  ['<leader>fm'] = { '<cmd>lua vim.lsp.buf.format()<CR>', '[LSP] Format' },
+  ['gd'] = { '<cmd>lua vim.lsp.buf.definition()<CR>', '[LSP] Go to definition' },
+  ['K'] = { '<cmd>Lspsaga hover_doc<CR>', '[LSP] Hover documentation' },
+  ['<leader><space>'] = { '<cmd>lua vim.lsp.buf.signature_help()<CR>', '[LSP] Get signature help' },
+  ['<leader>rn'] = { '<cmd>Lspsaga rename<CR>', '[LSP] Rename' },
+  ['gr'] = { '<cmd>lua vim.lsp.buf.references()<CR>', '[LSP] Get references' },
+  ['[d'] = { '<cmd>lua vim.diagnostic.goto_prev()<CR>', '[LSP] Go to previous diagnostic' },
+  [']d'] = { '<cmd>lua vim.diagnostic.goto_next()<CR>', '[LSP] Go to next diagnostic' },
+
   -- NvimTree
   ['<C-e>'] = { '<cmd>NvimTreeToggle<cr>', '[NVIMTREE] Toggle' },
 
diff --git a/nvim/lua/lsp/init.lua b/nvim/lua/lsp/init.lua
index a17a45a..ba407af 100644
--- a/nvim/lua/lsp/init.lua
+++ b/nvim/lua/lsp/init.lua
@@ -3,61 +3,29 @@ if not _lspconfig then
   return
 end
 
-local formatGroup = vim.api.nvim_create_augroup('LspFormatting', {})
-local lsp_formatting = function(bufnr)
-  vim.lsp.buf.format({
-    bufnr = bufnr,
-    filter = function(client)
-      return client.name == 'null-ls'
-    end,
-  })
-end
-local on_attach = function(client, bufnr)
-  local function map(...)
-    vim.api.nvim_buf_set_keymap(bufnr, ...)
-  end
-
-  local opts = {
-    noremap = true,
-    silent = true,
-  }
-
-  map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-  map('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-  map('n', 'K', '<cmd>Lspsaga hover_doc<CR>', opts)
-  map('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-  map('n', '<space><space>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-  map('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-  map('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-  map('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  map('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  map('n', '<space>rn', '<cmd>Lspsaga rename<CR>', opts)
-  map('n', '<space>ca', '<cmd>Lspsaga code_action<CR>', opts)
-  map('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  map('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-  map('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-  map('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-  map('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-  map('n', '<space>f', '<cmd>lua vim.lsp.buf.format()<CR>', opts)
-
-  if client.supports_method('textDocument/formatting') then
-    vim.api.nvim_clear_autocmds({ group = formatGroup, buffer = bufnr })
-    vim.api.nvim_create_autocmd({ 'BufWritePre' }, {
-      group = formatGroup,
-      buffer = bufnr,
-      callback = function()
-        lsp_formatting(bufnr)
-      end,
-    })
-  end
-end
-
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-local _cmp_nvim_lsp, cmp_nvim_lsp = pcall(require, 'cmp_nvim_lsp')
-if _cmp_nvim_lsp then
-  capabilities = cmp_nvim_lsp.default_capabilities()
-end
-
+vim.api.nvim_create_autocmd('LspAttach', {
+  callback = function(args)
+    local client = vim.lsp.get_client_by_id(args.data.client_id)
+    if not client then
+      return
+    end
+
+    ---@diagnostic disable-next-line: missing-parameter, param-type-mismatch
+    if client.supports_method('textDocument/formatting') then
+      vim.api.nvim_create_autocmd('BufWritePre', {
+        buffer = args.buf,
+        callback = function()
+          vim.lsp.buf.format({ bufnr = args.buf, id = client.id })
+        end,
+        -- filter = function(client)
+        --   return client.name == 'null-ls'
+        -- end,
+      })
+    end
+  end,
+})
+
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local servers = {
   'ansiblels',
   'bashls',
diff --git a/nvim/lua/lsp/servers/bashls.lua b/nvim/lua/lsp/servers/bashls.lua
index 8895d6e..e8704ab 100644
--- a/nvim/lua/lsp/servers/bashls.lua
+++ b/nvim/lua/lsp/servers/bashls.lua
@@ -1,17 +1,7 @@
 local _M = {}
 
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').bashls.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    filetypes = {
-      'sh',
-      'bash',
-    },
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
+_M.setup = function()
+  vim.lsp.enable('bashls')
 end
 
 return _M
diff --git a/nvim/lua/lsp/servers/lua_ls.lua b/nvim/lua/lsp/servers/lua_ls.lua
index f88bfbb..3dc1f9b 100644
--- a/nvim/lua/lsp/servers/lua_ls.lua
+++ b/nvim/lua/lsp/servers/lua_ls.lua
@@ -1,4 +1,4 @@
-local _plugin, plugin = pcall(require, 'neodev')
+local _plugin, plugin = pcall(require, 'lazydev')
 if not _plugin then
   return
 end
diff --git a/nvim/lua/lsp/servers/none_ls.lua b/nvim/lua/lsp/servers/none_ls.lua
index 95f274e..e79d296 100644
--- a/nvim/lua/lsp/servers/none_ls.lua
+++ b/nvim/lua/lsp/servers/none_ls.lua
@@ -16,7 +16,6 @@ _M.setup = function(on_attach)
     root_dir = require('null-ls.utils').root_pattern('.git', 'package.json', 'composer.json'),
     sources = {
       require('none-ls.code_actions.eslint_d'),
-      -- code_actions.shellcheck,
 
       diagnostics.actionlint,
       -- diagnostics.ansiblelint,
@@ -28,7 +27,6 @@ _M.setup = function(on_attach)
         prefer_local = './vendor/bin',
       }),
       -- diagnostics.phpmd, -- FIX: doesn't work yet.
-      -- diagnostics.shellcheck,
       diagnostics.stylelint.with({
         prefer_local = './node_modules/stylelint/bin',
       }),
@@ -47,13 +45,6 @@ _M.setup = function(on_attach)
         prefer_local = './node_modules/stylelint/bin',
       }),
       formatting.stylua,
-      formatting.shfmt.with({
-        filetypes = {
-          'sh',
-          'bash',
-          'zsh',
-        },
-      }),
       formatting.tidy,
     },
     on_attach = on_attach,
diff --git a/nvim/lua/plugins/configs/cmp.lua b/nvim/lua/plugins/configs/cmp.lua
index 31d29ef..d1ddd81 100644
--- a/nvim/lua/plugins/configs/cmp.lua
+++ b/nvim/lua/plugins/configs/cmp.lua
@@ -62,6 +62,7 @@ cmp.setup({
     { name = 'nvim_lsp', group_index = 2 },
     { name = 'path', group_index = 2 },
     { name = 'luasnip', group_index = 2 },
+    { name = 'lazydev', group_index = 2 },
     -- { name = 'emoji' },
   }, {
     { name = 'buffer' },
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index a0cd981..98a1007 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -142,8 +142,20 @@ require('lazy').setup({
 
   -- Language Server Protocol
   {
-    'folke/neodev.nvim',
-    'neovim/nvim-lspconfig',
+    {
+      'neovim/nvim-lspconfig',
+      dependencies = {
+        'folke/lazydev.nvim',
+        ft = 'lua',
+        opts = {
+          library = {
+            -- See the configuration section for more details
+            -- Load luvit types when the `vim.uv` word is found
+            { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+          },
+        },
+      },
+    },
     {
       'nvimtools/none-ls.nvim',
       dependencies = {
@@ -268,6 +280,13 @@ require('lazy').setup({
           end,
         },
       },
+      opts = function(_, opts)
+        opts.sources = opts.sources or {}
+        table.insert(opts.sources, {
+          name = 'lazydev',
+          group_index = 0, -- set group index to 0 to skip loading LuaLS completions
+        })
+      end,
     },
     {
       'windwp/nvim-autopairs',

From 4a082259ff54e82085053049e4047bf3592b615d Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Sat, 19 Jul 2025 17:03:02 +0100
Subject: [PATCH 6/6] refactor(nvim): cleaner LSP configs

---
 nvim/lua/lsp/init.lua                  | 20 ++++++++++-------
 nvim/lua/lsp/servers/ansiblels.lua     | 13 -----------
 nvim/lua/lsp/servers/bashls.lua        |  7 ------
 nvim/lua/lsp/servers/cssls.lua         | 19 ----------------
 nvim/lua/lsp/servers/dockerls.lua      | 13 -----------
 nvim/lua/lsp/servers/eslint.lua        | 30 --------------------------
 nvim/lua/lsp/servers/gopls.lua         | 13 -----------
 nvim/lua/lsp/servers/html.lua          | 13 -----------
 nvim/lua/lsp/servers/intelephense.lua  | 16 +++-----------
 nvim/lua/lsp/servers/jsonls.lua        | 11 +++-------
 nvim/lua/lsp/servers/lemminx.lua       | 13 -----------
 nvim/lua/lsp/servers/ltex.lua          | 11 +++-------
 nvim/lua/lsp/servers/lua_ls.lua        | 11 +++-------
 nvim/lua/lsp/servers/none_ls.lua       |  7 ++----
 nvim/lua/lsp/servers/pyright.lua       | 13 -----------
 nvim/lua/lsp/servers/rust_analyzer.lua | 13 -----------
 nvim/lua/lsp/servers/stylelint_lsp.lua | 11 +++-------
 nvim/lua/lsp/servers/svelte.lua        | 16 --------------
 nvim/lua/lsp/servers/tailwindcss.lua   | 11 +++-------
 nvim/lua/lsp/servers/ts_ls.lua         | 11 ++++------
 nvim/lua/lsp/servers/volar.lua         | 19 ----------------
 nvim/lua/lsp/servers/yamlls.lua        | 13 -----------
 22 files changed, 36 insertions(+), 268 deletions(-)
 delete mode 100644 nvim/lua/lsp/servers/ansiblels.lua
 delete mode 100644 nvim/lua/lsp/servers/bashls.lua
 delete mode 100644 nvim/lua/lsp/servers/cssls.lua
 delete mode 100644 nvim/lua/lsp/servers/dockerls.lua
 delete mode 100644 nvim/lua/lsp/servers/eslint.lua
 delete mode 100644 nvim/lua/lsp/servers/gopls.lua
 delete mode 100644 nvim/lua/lsp/servers/html.lua
 delete mode 100644 nvim/lua/lsp/servers/lemminx.lua
 delete mode 100644 nvim/lua/lsp/servers/pyright.lua
 delete mode 100644 nvim/lua/lsp/servers/rust_analyzer.lua
 delete mode 100644 nvim/lua/lsp/servers/svelte.lua
 delete mode 100644 nvim/lua/lsp/servers/volar.lua
 delete mode 100644 nvim/lua/lsp/servers/yamlls.lua

diff --git a/nvim/lua/lsp/init.lua b/nvim/lua/lsp/init.lua
index ba407af..a4688c3 100644
--- a/nvim/lua/lsp/init.lua
+++ b/nvim/lua/lsp/init.lua
@@ -29,31 +29,35 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local servers = {
   'ansiblels',
   'bashls',
-  -- 'cssls',
   'dockerls',
-  'eslint',
+  -- 'eslint',
   'gopls',
   'html',
   'intelephense',
   'jsonls',
   'lemminx',
   'lua_ls',
-  'none_ls',
   'pyright',
   'rust_analyzer',
   'stylelint_lsp',
   'ts_ls',
-  'volar',
+  'vue_ls',
   'yamlls',
   'tailwindcss',
 }
 for _, server in pairs(servers) do
   local _config, config = pcall(require, 'lsp.servers.' .. server)
-  if not _config then
-    return
+  if _config then
+    vim.lsp.config(server, config(capabilities))
+    vim.lsp.enable(server)
+  else
+    vim.lsp.config(server, {
+      capabilities = capabilities,
+    })
+    vim.lsp.enable(server)
   end
-
-  config.setup(on_attach, capabilities)
 end
 
+require('lsp.servers.none_ls').setup()
+
 return
diff --git a/nvim/lua/lsp/servers/ansiblels.lua b/nvim/lua/lsp/servers/ansiblels.lua
deleted file mode 100644
index 4659e9c..0000000
--- a/nvim/lua/lsp/servers/ansiblels.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').ansiblels.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/bashls.lua b/nvim/lua/lsp/servers/bashls.lua
deleted file mode 100644
index e8704ab..0000000
--- a/nvim/lua/lsp/servers/bashls.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local _M = {}
-
-_M.setup = function()
-  vim.lsp.enable('bashls')
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/cssls.lua b/nvim/lua/lsp/servers/cssls.lua
deleted file mode 100644
index 11c5ced..0000000
--- a/nvim/lua/lsp/servers/cssls.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local _M = {}
---Enable (broadcasting) snippet capability for completion
--- local capabilities = vim.lsp.protocol.make_client_capabilities()
--- capabilities.textDocument.completion.completionItem.snippetSupport = true
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').cssls.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-    init_options = {
-      provideFormatter = false,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/dockerls.lua b/nvim/lua/lsp/servers/dockerls.lua
deleted file mode 100644
index 55c733a..0000000
--- a/nvim/lua/lsp/servers/dockerls.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').dockerls.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/eslint.lua b/nvim/lua/lsp/servers/eslint.lua
deleted file mode 100644
index bc7e461..0000000
--- a/nvim/lua/lsp/servers/eslint.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  local lspconfig = require('lspconfig')
-
-  lspconfig.eslint.setup({
-    root_dir = lspconfig.util.root_pattern('.eslintrc', '.eslintrc.js', '.eslintrc.json'),
-    on_attach = function(client, bufnr)
-      client.server_capabilities.documentFormattingProvider = true
-      on_attach(client, bufnr)
-    end,
-    capabilities = capabilities,
-    settings = {
-      format = {
-        enable = false,
-      },
-    },
-    handlers = {
-      ['window/showMessageRequest'] = function(_, result)
-        if result.message:find('ENOENT') then
-          return vim.NIL
-        end
-
-        return vim.lsp.handlers['window/showMessageRequest'](nil, result)
-      end,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/gopls.lua b/nvim/lua/lsp/servers/gopls.lua
deleted file mode 100644
index fbabf89..0000000
--- a/nvim/lua/lsp/servers/gopls.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').gopls.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/html.lua b/nvim/lua/lsp/servers/html.lua
deleted file mode 100644
index 836a778..0000000
--- a/nvim/lua/lsp/servers/html.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').html.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/intelephense.lua b/nvim/lua/lsp/servers/intelephense.lua
index c9fa9b0..2ad4314 100644
--- a/nvim/lua/lsp/servers/intelephense.lua
+++ b/nvim/lua/lsp/servers/intelephense.lua
@@ -1,13 +1,5 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  local _lspconfig, lspconfig = pcall(require, 'lspconfig')
-  if not _lspconfig then
-    return
-  end
-
-  lspconfig.intelephense.setup({
-    on_attach = on_attach,
+return function(capabilities)
+  return {
     capabilities = capabilities,
     flags = {
       debounce_text_changes = 150,
@@ -36,7 +28,5 @@ _M.setup = function(on_attach, capabilities)
         },
       },
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/jsonls.lua b/nvim/lua/lsp/servers/jsonls.lua
index f3dfc1d..0f62188 100644
--- a/nvim/lua/lsp/servers/jsonls.lua
+++ b/nvim/lua/lsp/servers/jsonls.lua
@@ -1,8 +1,5 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').jsonls.setup({
-    on_attach = on_attach,
+return function(capabilities)
+  return {
     capabilities = capabilities,
     flags = {
       debounce_text_changes = 150,
@@ -33,7 +30,5 @@ _M.setup = function(on_attach, capabilities)
         },
       },
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/lemminx.lua b/nvim/lua/lsp/servers/lemminx.lua
deleted file mode 100644
index 4272b89..0000000
--- a/nvim/lua/lsp/servers/lemminx.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').lemminx.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/ltex.lua b/nvim/lua/lsp/servers/ltex.lua
index 9dd8a6f..cca6f19 100644
--- a/nvim/lua/lsp/servers/ltex.lua
+++ b/nvim/lua/lsp/servers/ltex.lua
@@ -1,15 +1,10 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').ltex.setup({
-    on_attach = on_attach,
+return function(capabilities)
+  return {
     capabilities = capabilities,
     settings = {
       ltex = {
         language = 'en',
       },
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/lua_ls.lua b/nvim/lua/lsp/servers/lua_ls.lua
index 3dc1f9b..968d305 100644
--- a/nvim/lua/lsp/servers/lua_ls.lua
+++ b/nvim/lua/lsp/servers/lua_ls.lua
@@ -5,12 +5,9 @@ end
 
 plugin.setup({})
 
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').lua_ls.setup({
+return function(capabilities)
+  return {
     lspconfig = {
-      on_attach = on_attach,
       capabilities = capabilities,
       settings = {
         Lua = {
@@ -34,7 +31,5 @@ _M.setup = function(on_attach, capabilities)
         debounce_text_changes = 150,
       },
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/none_ls.lua b/nvim/lua/lsp/servers/none_ls.lua
index e79d296..dcf9225 100644
--- a/nvim/lua/lsp/servers/none_ls.lua
+++ b/nvim/lua/lsp/servers/none_ls.lua
@@ -10,23 +10,21 @@ end
 local formatting = plugin.builtins.formatting
 local diagnostics = plugin.builtins.diagnostics
 
-_M.setup = function(on_attach)
+_M.setup = function(capabilities)
   plugin.setup({
+    capabilities = capabilities,
     debug = true,
     root_dir = require('null-ls.utils').root_pattern('.git', 'package.json', 'composer.json'),
     sources = {
       require('none-ls.code_actions.eslint_d'),
 
       diagnostics.actionlint,
-      -- diagnostics.ansiblelint,
-      -- diagnostics.chktex,
       require('none-ls.diagnostics.eslint_d'),
       diagnostics.hadolint,
       diagnostics.markdownlint,
       diagnostics.phpcs.with({
         prefer_local = './vendor/bin',
       }),
-      -- diagnostics.phpmd, -- FIX: doesn't work yet.
       diagnostics.stylelint.with({
         prefer_local = './node_modules/stylelint/bin',
       }),
@@ -47,7 +45,6 @@ _M.setup = function(on_attach)
       formatting.stylua,
       formatting.tidy,
     },
-    on_attach = on_attach,
   })
 end
 
diff --git a/nvim/lua/lsp/servers/pyright.lua b/nvim/lua/lsp/servers/pyright.lua
deleted file mode 100644
index b24f707..0000000
--- a/nvim/lua/lsp/servers/pyright.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').pyright.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/rust_analyzer.lua b/nvim/lua/lsp/servers/rust_analyzer.lua
deleted file mode 100644
index 1dedac8..0000000
--- a/nvim/lua/lsp/servers/rust_analyzer.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').rust_analyzer.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/stylelint_lsp.lua b/nvim/lua/lsp/servers/stylelint_lsp.lua
index 81cbc03..8bcebe8 100644
--- a/nvim/lua/lsp/servers/stylelint_lsp.lua
+++ b/nvim/lua/lsp/servers/stylelint_lsp.lua
@@ -1,14 +1,11 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
+return function(capabilities)
   local filetypes = {
     'sass',
     'scss',
     'postcss',
   }
 
-  require('lspconfig').stylelint_lsp.setup({
-    on_attach = on_attach,
+  return {
     capabilities = capabilities,
     flags = {
       debounce_text_changes = 150,
@@ -21,7 +18,5 @@ _M.setup = function(on_attach, capabilities)
         filetypes = filetypes,
       },
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/svelte.lua b/nvim/lua/lsp/servers/svelte.lua
deleted file mode 100644
index 89c6bdb..0000000
--- a/nvim/lua/lsp/servers/svelte.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').svelte.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-    filetypes = {
-      'svelte',
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/tailwindcss.lua b/nvim/lua/lsp/servers/tailwindcss.lua
index 736a2d7..fab16dc 100644
--- a/nvim/lua/lsp/servers/tailwindcss.lua
+++ b/nvim/lua/lsp/servers/tailwindcss.lua
@@ -1,14 +1,9 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').tailwindcss.setup({
-    on_attach = on_attach,
+return function(capabilities)
+  return {
     capabilities = capabilities,
     filetypes = {
       'html',
       'css',
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/ts_ls.lua b/nvim/lua/lsp/servers/ts_ls.lua
index 6b8927c..86693b2 100644
--- a/nvim/lua/lsp/servers/ts_ls.lua
+++ b/nvim/lua/lsp/servers/ts_ls.lua
@@ -1,7 +1,6 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').ts_ls.setup({
+return function(capabilities)
+  return {
+    capabilities = capabilities,
     init_options = {
       plugins = {
         {
@@ -18,7 +17,5 @@ _M.setup = function(on_attach, capabilities)
       'typescript.tsx',
       'vue',
     },
-  })
+  }
 end
-
-return _M
diff --git a/nvim/lua/lsp/servers/volar.lua b/nvim/lua/lsp/servers/volar.lua
deleted file mode 100644
index 295f29c..0000000
--- a/nvim/lua/lsp/servers/volar.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  local typescript_path = vim.env.HOME .. '/.config/yarn/global/node_modules/typescript/lib'
-  require('lspconfig').volar.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-    init_options = {
-      typescript = {
-        tsdk = typescript_path,
-      },
-    },
-  })
-end
-
-return _M
diff --git a/nvim/lua/lsp/servers/yamlls.lua b/nvim/lua/lsp/servers/yamlls.lua
deleted file mode 100644
index f1bc09a..0000000
--- a/nvim/lua/lsp/servers/yamlls.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local _M = {}
-
-_M.setup = function(on_attach, capabilities)
-  require('lspconfig').yamlls.setup({
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-      debounce_text_changes = 150,
-    },
-  })
-end
-
-return _M