nvim config update

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
 

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"

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' },
 

nvim/lua/lsp/init.lua

@@ -3,89 +3,61 @@ 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',
-  -- 'cssls',
   'dockerls',
-  'eslint',
+  -- 'eslint',
   'gopls',
   'html',
   'intelephense',
   'jsonls',
   'lemminx',
   'lua_ls',
-  'null_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

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

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

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