mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-08-16 23:41:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nvim-lsp: added package options for basic servers

Browse source
This commit is contained in:
Alexander Nortung 2022-10-30 22:15:16 +01:00
parent e19114a4d0
commit acefec6468
2 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/nvim-lsp/basic-servers.nix
View file

@ -5,28 +5,28 @@ let
{ {
name = "clangd"; name = "clangd";
description = "Enable clangd LSP, for C/C++."; description = "Enable clangd LSP, for C/C++.";
packages = [ pkgs.clang-tools ]; package = pkgs.clang-tools;
} }
{ {
name = "cssls"; name = "cssls";
description = "Enable cssls, for CSS"; description = "Enable cssls, for CSS";
packages = [ pkgs.nodePackages.vscode-langservers-extracted ]; package = pkgs.nodePackages.vscode-langservers-extracted;
} }
{ {
name = "eslint"; name = "eslint";
description = "Enable eslint"; description = "Enable eslint";
packages = [ pkgs.nodePackages.vscode-langservers-extracted ]; package = pkgs.nodePackages.vscode-langservers-extracted;
} }
{ {
name = "elixirls"; name = "elixirls";
description = "Enable elixirls"; description = "Enable elixirls";
packages = [ ]; package = null;
cmd = ["${pkgs.elixir_ls}/bin/elixir-ls"]; cmd = ["${pkgs.elixir_ls}/bin/elixir-ls"];
} }
{ {
name = "gdscript"; name = "gdscript";
description = "Enable gdscript, for Godot"; description = "Enable gdscript, for Godot";
packages = [ ]; package = null;
} }
{ {
name = "gopls"; name = "gopls";
@ -35,12 +35,12 @@ let
{ {
name = "html"; name = "html";
description = "Enable html, for HTML"; description = "Enable html, for HTML";
packages = [ pkgs.nodePackages.vscode-langservers-extracted ]; package = pkgs.nodePackages.vscode-langservers-extracted;
} }
{ {
name = "jsonls"; name = "jsonls";
description = "Enable jsonls, for JSON"; description = "Enable jsonls, for JSON";
packages = [ pkgs.nodePackages.vscode-langservers-extracted ]; package = pkgs.nodePackages.vscode-langservers-extracted;
} }
{ {
name = "pyright"; name = "pyright";
@ -59,15 +59,15 @@ let
{ {
name = "tsserver"; name = "tsserver";
description = "Enable tsserver for typescript"; description = "Enable tsserver for typescript";
packages = with pkgs; [ package = pkgs.nodePackages.typescript-language-server;
nodePackages.typescript extraPackages = {
nodePackages.typescript-language-server typescript = pkgs.nodePackages.typescript;
]; };
} }
{ {
name = "vuels"; name = "vuels";
description = "Enable vuels, for Vue"; description = "Enable vuels, for Vue";
packages = [ pkgs.nodePackages.vue-language-server ]; package = pkgs.nodePackages.vue-language-server;
} }
{ {
name = "zls"; name = "zls";

26
plugins/nvim-lsp/helpers.nix
View file

@ -5,7 +5,8 @@
{ name { name
, description ? "Enable ${name}." , description ? "Enable ${name}."
, serverName ? name , serverName ? name
, packages ? [ pkgs.${name} ] , package ? pkgs.${name}
, extraPackages ? { }
, cmd ? null , cmd ? null
, ... , ...
}: }:
@ -14,16 +15,35 @@
with lib; with lib;
let let
cfg = config.plugins.lsp.servers.${name}; cfg = config.plugins.lsp.servers.${name};
packageOption =
if package != null then {
package = mkOption {
default = package;
type = types.nullOr types.package;
};
} else { };
extraPackagesOptions = mapAttrs'
(name: defaultPackage: {
name = "${name}Package";
value = mkOption {
default = defaultPackage;
type = types.package;
};
})
extraPackages;
in in
{ {
options = { options = {
plugins.lsp.servers.${name} = { plugins.lsp.servers.${name} = {
enable = mkEnableOption description; enable = mkEnableOption description;
}; } // packageOption // extraPackagesOptions;
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
extraPackages = packages; extraPackages = (optional (package != null) cfg.package) ++
(mapAttrsToList (name: _: cfg."${name}Package") extraPackages);
plugins.lsp.enabledServers = [{ plugins.lsp.enabledServers = [{
name = serverName; name = serverName;