summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Chausse <benjamin@chausse.xyz>2024-05-26 01:35:41 -0400
committerBenjamin Chausse <benjamin@chausse.xyz>2024-05-26 01:35:41 -0400
commit5c71438949d6f17ae96a618c48436a6ce84ec3d2 (patch)
tree96f02bcb6361fc476e7943c5bddb88d1e1eef28c
parentf03a8e53b88d7db5f5b52b2d5481cdad4fa40bf0 (diff)
More lsp servers + clear search highlighs
-rw-r--r--lua/core/init.lua2
-rw-r--r--lua/plugins/lsp.lua18
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,