From 162b3d0d13469b9e23dcd796a496a4d8ee403e29 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 23 May 2023 17:12:35 -0400 Subject: [PATCH] neovim: Add more language servers --- dev/default.nix | 4 ++++ dev/rust/default.nix | 1 + terminal/neovim/default.nix | 30 +++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dev/default.nix b/dev/default.nix index bd415ff..14fb71e 100644 --- a/dev/default.nix +++ b/dev/default.nix @@ -10,5 +10,9 @@ environment.systemPackages = with pkgs; [ marksman + gopls + lua-language-server + clang-tools + texlab ]; } diff --git a/dev/rust/default.nix b/dev/rust/default.nix index c5f8639..fd95774 100644 --- a/dev/rust/default.nix +++ b/dev/rust/default.nix @@ -6,5 +6,6 @@ rustc rustfmt cargo + rust-analyzer ]; } diff --git a/terminal/neovim/default.nix b/terminal/neovim/default.nix index 4ec3880..20c7af9 100644 --- a/terminal/neovim/default.nix +++ b/terminal/neovim/default.nix @@ -102,7 +102,35 @@ { plugin = nvim-lspconfig; type = "lua"; - config = "require'lspconfig'.nil_ls.setup{}"; + config = " + local lspconfig = require('lspconfig') + lspconfig.nil_ls.setup {} + lspconfig.rust_analyzer.setup {} + lspconfig.marksman.setup {} + lspconfig.gopls.setup {} + lspconfig.lua_ls.setup {} + lspconfig.clangd.setup {} + lspconfig.texlab.setup {} + vim.keymap.set('n', 'e', vim.diagnostic.open_float) + vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) + vim.keymap.set('n', ']d', vim.diagnostic.goto_next) + vim.keymap.set('n', 'q', vim.diagnostic.setloclist) + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('UserLspConfig', {}), + callback = function(ev) + local opts = { buffer = ev.buf } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) + vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) + end, + }) + "; } { plugin = nvim-base16;