Add lsp servers

dot_config/nvim/lua/plugins/base.lua

@@ -1,22 +1,7 @@
-local config = function()
-	local wk = require 'which-key'
-	wk.setup()
-	wk.register {
-		['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
-		['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
-		['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
-		['<leader>h'] = { name = 'More git', _ = 'which_key_ignore' },
-		['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
-		['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
-		['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
-	}
-end
-
 return {
-	'folke/which-key.nvim',
+  'tpope/vim-surround',
-	config = config,
+  tag = 'v2.2',
   dependencies = {
     { 'tpope/vim-sleuth', tag = 'v2.0' },
-		{ 'tpope/vim-surround', tag = 'v2.2' },
   },
 }

dot_config/nvim/lua/plugins/lsp.lua

@@ -1,93 +0,0 @@
-local function on_attach(_, bufnr)
-	local nmap = function(keys, func, desc)
-		if desc then
-			desc = 'LSP: ' .. desc
-		end
-		vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
-	end
-
-	nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-	nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
-
-	nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-	nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-	nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-	nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
-	nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-	nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
-	-- See `:help K` for why this keymap
-	nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-	nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
-
-	-- Lesser used LSP functionality
-	nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-	nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-	nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-	nmap('<leader>wl', function()
-		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-	end, '[W]orkspace [L]ist Folders')
-
-	-- Create a command `:Format` local to the LSP buffer
-	vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-		vim.lsp.buf.format()
-	end, { desc = 'Format current buffer with LSP' })
-end
-
-local function config()
-	local mason = require 'mason'
-	local mason_lspconfig = require 'mason-lspconfig'
-	local neodev = require 'neodev'
-
-	mason.setup()
-	neodev.setup()
-
-	local servers = {
-		-- clangd = {},
-		-- pyright = {},
-		-- rust_analyzer = {},
-		-- tsserver = {},
-		-- html = { filetypes = { 'html', 'twig', 'hbs'} },
-		gopls = {},
-		lua_ls = {
-			Lua = {
-				workspace = { checkThirdParty = false },
-				telemetry = { enable = false },
-			},
-		},
-	}
-
-	local capabilities = vim.lsp.protocol.make_client_capabilities()
-	capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
-
-	mason_lspconfig.setup {
-		ensure_installed = vim.tbl_keys(servers),
-	}
-
-	mason_lspconfig.setup_handlers {
-		function(server_name)
-			require('lspconfig')[server_name].setup {
-				capabilities = capabilities,
-				on_attach = on_attach,
-				settings = servers[server_name],
-				filetypes = (servers[server_name] or {}).filetypes,
-			}
-		end,
-	}
-end
-
-return {
-	-- LSP Configuration & Plugins
-	'neovim/nvim-lspconfig',
-	config = config,
-	dependencies = {
-		-- Automatically install LSPs to stdpath for neovim
-		'williamboman/mason.nvim',
-		'williamboman/mason-lspconfig.nvim',
-		-- Useful status updates for LSP
-		{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
-		-- Additional lua configuration, makes nvim stuff amazing!
-		'folke/neodev.nvim',
-		'folke/trouble.nvim',
-	},
-}

dot_config/nvim/lua/plugins/lsp.lua.tmpl

@@ -0,0 +1,112 @@
+# chezmoi:template:left-delimiter=--{{
+--{{- /* vim: set filetype=lua: */ -}}
+local function on_attach(_, buffer)
+  local function nmap(keys, func, desc)
+    if desc then
+      desc = 'LSP: ' .. desc
+    end
+    vim.keymap.set('n', keys, func, { buffer = buffer, desc = desc })
+  end
+
+  local function inspect_workspace_folders()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end
+
+  local function format_buffer(_)
+    vim.lsp.buf.format()
+  end
+
+  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+
+  local builtin = require 'telescope.builtin'
+  nmap('gd', builtin.lsp_definitions, '[G]oto [D]efinition')
+  nmap('gr', builtin.lsp_references, '[G]oto [R]eferences')
+  nmap('gI', builtin.lsp_implementations, '[G]oto [I]mplementation')
+  nmap('<leader>D', builtin.lsp_type_definitions, 'Type [D]efinition')
+  nmap('<leader>ds', builtin.lsp_document_symbols, '[D]ocument [S]ymbols')
+  nmap('<leader>ws', builtin.lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+
+  -- See `:help K` for why this keymap
+  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
+  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+
+  -- Lesser used LSP functionality
+  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
+  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
+  nmap('<leader>wl', inspect_workspace_folders, '[W]orkspace [L]ist Folders')
+
+  -- Create a command `:Format` local to the LSP buffer
+  vim.api.nvim_buf_create_user_command(buffer, 'Format', format_buffer, {
+    desc = 'Format current buffer with LSP',
+  })
+end
+
+local function config()
+  local cmp_nvim_lsp = require 'cmp_nvim_lsp'
+  local lspconfig = require 'lspconfig'
+  local mason = require 'mason'
+  local mason_lspconfig = require 'mason-lspconfig'
+  local neodev = require 'neodev'
+
+  mason.setup()
+  neodev.setup()
+
+  local servers = {
+    bashls = {},
+    bufls = {},
+    taplo = {},
+    dockerls = {},
+    jsonls = {},
+    jqls = {},
+    marksman = {},
+    sqlls = {},
+    vimls = {},
+    yamlls = {},
+    --{{ if lookPath "node" -}}
+    eslint = {},
+    --{{- end }}
+    --{{ if lookPath "go" -}}
+    gopls = {},
+    templ = {},
+    -- golangci_lint_ls = {},
+    --{{- end }}
+    lua_ls = {
+      Lua = {
+        workspace = { checkThirdParty = false },
+        telemetry = { enable = false },
+      },
+    },
+  }
+
+  local capabilities = vim.lsp.protocol.make_client_capabilities()
+  capabilities = cmp_nvim_lsp.default_capabilities(capabilities)
+
+  mason_lspconfig.setup {
+    ensure_installed = vim.tbl_keys(servers),
+  }
+
+  mason_lspconfig.setup_handlers {
+    function(server_name)
+      lspconfig[server_name].setup {
+        capabilities = capabilities,
+        on_attach = on_attach,
+        settings = servers[server_name],
+        filetypes = (servers[server_name] or {}).filetypes,
+      }
+    end,
+  }
+end
+
+return {
+  'neovim/nvim-lspconfig',
+  config = config,
+  dependencies = {
+    { 'williamboman/mason.nvim',           tag = 'v1.*' },
+    { 'williamboman/mason-lspconfig.nvim', tag = 'v1.*' },
+    { 'j-hui/fidget.nvim',                 tag = 'legacy', opts = {} },
+    { 'folke/neodev.nvim',                 tag = 'v2.*' },
+    { 'folke/trouble.nvim',                tag = 'v2.*' },
+  },
+}

dot_config/nvim/lua/plugins/tree.lua

@@ -7,7 +7,7 @@ local function handle_closed(window)
   local buffer = vim.api.nvim_win_get_buf(window)
   local info = vim.fn.getbufinfo(buffer)[1]
 
-	local filter_window = function(w)
+  local function filter_window(w)
     return w ~= window
   end
 
@@ -37,13 +37,13 @@ local function handle_closed(window)
   end
 end
 
-local config = function()
+local function config()
   require('nvim-tree').setup()
   vim.api.nvim_create_autocmd('WinClosed', {
     nested = true,
     callback = function()
       local window = tonumber(vim.fn.expand('<amatch>'))
-			vim.schedule_wrap(handle_closed(window))
+      handle_closed(window)
     end,
   })
 end

dot_config/nvim/lua/plugins/which-key.lua

@@ -0,0 +1,25 @@
+local function init()
+  vim.o.timeout = true
+  vim.o.timeoutlen = 300
+end
+
+local function config()
+  local wk = require 'which-key'
+  wk.setup()
+  wk.register {
+    ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
+    ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+    ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
+    ['<leader>h'] = { name = 'More git', _ = 'which_key_ignore' },
+    ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
+    ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
+    ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
+  }
+end
+
+return {
+  'folke/which-key.nvim',
+  init = init,
+  config = config,
+  event = "VeryLazy",
+}

dot_editorconfig

@@ -15,6 +15,6 @@ indent_style = tab
 indent_size = 4
 indent_style = space
 
-[*.{json,yml,yaml}]
+[*.{json,yml,yaml,lua}]
 indent_style = space
 indent_size = 2