From 30ab66549fe2c987135667b54749757f2da18aa4 Mon Sep 17 00:00:00 2001 From: Rachel Lambda Samuelsson Date: Wed, 18 Oct 2023 18:55:59 +0200 Subject: [PATCH] lsp fixes --- home/rachel.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/home/rachel.nix b/home/rachel.nix index 2df2bd3..942212b 100644 --- a/home/rachel.nix +++ b/home/rachel.nix @@ -100,7 +100,6 @@ in videos = "${homeDir}/vid"; }; - programs = { bash = { enable = true; @@ -158,18 +157,22 @@ in require('Comment').setup() local lspcfg = require('lspconfig') lspcfg.typst_lsp.setup({ - cmd = { '${pkgs.typst-lsp}/bin/typst-lsp' } + cmd = { '${pkgs.typst-lsp}/bin/typst-lsp' }, }) lspcfg.hls.setup({ - cmd = { '${hls_wrapper}', 'lsp' } + cmd = { '${hls_wrapper}', 'lsp' }, }) lspcfg.pyright.setup({ - cmd = { '${pkgs.nodePackages.pyright}/bin/pyright-langserver', '--stdio' } + cmd = { '${pkgs.nodePackages.pyright}/bin/pyright-langserver', '--stdio' }, }) vim.api.nvim_create_autocmd('LspAttach', { callback = function(args) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = args.buf }) + local opts = { buffer = args.buf } + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) + vim.keymap.set('n', 'r', vim.lsp.buf.rename, opts) + vim.keymap.set('n', 'a', vim.lsp.buf.code_action, opts) + vim.keymap.set('i', '', vim.lsp.omnifunc, opts) end, })