diff options
| -rw-r--r-- | lua/core/init.lua | 2 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lua/core/init.lua b/lua/core/init.lua index 729c3e7..ba660a0 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -28,7 +28,7 @@ vim.g.netrw_banner = 0 vim.g.netrw_bufsettings = "noma nomod nu nobl nowrap ro" -- Clear search highlights -vim.keymap.set("n", "<C-/>", ":nohlsearch<cr>") +vim.keymap.set("n", "<leader><leader>l", "<cmd>nohlsearch<cr>") -- Don't mess with pasted text vim.keymap.set("i", "<C-r>+","<C-r><C-o>+") diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index ccd25a0..7f4bbb5 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -19,9 +19,14 @@ return { -- Global so it can be used by both mason and lspconfig ;) local myServers = { "gopls", + "golangci_lint_ls", "lua_ls", "bashls", "graphql", + "texlab", + "clangd", + "dockerls", + "docker_compose_language_service", "rust_analyzer", } mlsp.setup({ @@ -86,10 +91,15 @@ return { -- Configure every lsp installed and managed by mason -- TODO: automate this with a global myServers table - lsp["gopls"].setup({ capabilities = lspCaps, on_attach = lspMaps }) - lsp["bashls"].setup({ capabilities = lspCaps, on_attach = lspMaps }) - lsp["graphql"].setup({ capabilities = lspCaps, on_attach = lspMaps }) - lsp["rust_analyzer"].setup({ capabilities = lspCaps, on_attach = lspMaps }) + lsp["gopls"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["golangci_lint_ls"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["rust_analyzer"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["clangd"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["bashls"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["graphql"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["texlab"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["dockerls"].setup({ capabilities=lspCaps, on_attach=lspMaps }) + lsp["docker_compose_language_service"].setup({ capabilities=lspCaps, on_attach=lspMaps }) -- Non standard language settings: lsp.lua_ls.setup({ capabilities = lspCaps, |