Neovim, go lang, remore rustacean lsp call

This commit is contained in:
Julia Lange 2025-01-09 09:35:51 -08:00
parent 17c7fde05f
commit dfbe5210c4
Signed by: Julia
SSH key fingerprint: SHA256:KI8YxpkPRbnDRkXPgCuQCVz181++Vy7NAvmQj8alOhM
4 changed files with 13 additions and 5 deletions

View file

@ -5,6 +5,7 @@
enable = lib.mkEnableOption "Enables neovim";
languages = {
c.enable = lib.mkEnableOption "Enables c support";
go.enable = lib.mkEnableOption "Enables go support";
nix.enable = lib.mkEnableOption "Enables nix support";
rust.enable = lib.mkEnableOption "Enables rust support";
};
@ -48,6 +49,7 @@
extraPackages = with pkgs; [
(lib.mkIf config.neovim.languages.c.enable libclang)
(lib.mkIf config.neovim.languages.go.enable gopls)
(lib.mkIf config.neovim.languages.nix.enable nil)
(lib.mkIf config.neovim.languages.rust.enable rust-analyzer)
];
@ -96,6 +98,10 @@
rust-pkg = lopts cfgl.rust.enable (with pkgs.vimPlugins; [
rustaceanvim
]);
go-pkg = lopts cfgl.go.enable (with pkgs.vimPlugins; [
go-nvim
]);
wiki = lopts cfgp.wiki.enable (with pkgs.vimPlugins; [
{
@ -114,7 +120,7 @@
}
]);
in comments ++ fugitive ++ luasnip-pkg ++ lualine ++
nix-pkg ++ rust-pkg ++ wiki;
nix-pkg ++ rust-pkg ++ go-pkg ++ wiki;
};
};
}

View file

@ -35,12 +35,12 @@
end
local capabilities = vim.lsp.protocol.make_client_capabilities()
'' + lib.strings.optionalString cfgl.nix.enable ''
require('lspconfig').nil_ls.setup {}
'' + lib.strings.optionalString cfgl.c.enable ''
require('lspconfig').clangd.setup {}
'' + lib.strings.optionalString cfgl.rust.enable ''
require('lspconfig').rustaceanvim.setup {}
'' + lib.strings.optionalString cfgl.go.enable ''
require('lspconfig').gopls.setup {}
'' + lib.strings.optionalString cfgl.nix.enable ''
require('lspconfig').nil_ls.setup {}
'';
in with pkgs.vimPlugins; [
{

View file

@ -22,6 +22,7 @@ in {
# dynamically. For not just have them always loaded regardless of config
treeplugs = p: [
p.tree-sitter-c
p.tree-sitter-go
p.tree-sitter-nix
p.tree-sitter-rust
];