diff --git a/plugins/nvim-lsp/basic-servers.nix b/plugins/nvim-lsp/basic-servers.nix index fbb33878..d6109519 100644 --- a/plugins/nvim-lsp/basic-servers.nix +++ b/plugins/nvim-lsp/basic-servers.nix @@ -20,7 +20,8 @@ let { name = "elixirls"; description = "Enable elixirls"; - packages = [ pkgs.elixir_ls ]; + packages = [ ]; + cmd = "${pkgs.elixir_ls}/bin/elixir-ls"; } { name = "gdscript"; diff --git a/plugins/nvim-lsp/helpers.nix b/plugins/nvim-lsp/helpers.nix index 9b81cb8d..b2d9a395 100644 --- a/plugins/nvim-lsp/helpers.nix +++ b/plugins/nvim-lsp/helpers.nix @@ -6,6 +6,7 @@ , description ? "Enable ${name}." , serverName ? name , packages ? [ pkgs.${name} ] + , cmd ? null , ... }: # returns a module @@ -24,7 +25,12 @@ config = mkIf cfg.enable { extraPackages = packages; - plugins.lsp.enabledServers = [ serverName ]; + plugins.lsp.enabledServers = [{ + name = serverName; + extraOptions = { + inherit cmd; + }; + }]; }; }; } diff --git a/tests/flake.lock b/tests/flake.lock index a6a200d3..4caea77c 100644 --- a/tests/flake.lock +++ b/tests/flake.lock @@ -97,12 +97,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-51K3gjUQAgBuXJMUCxloBqJeRiB5nwix0kMSbffDxak=", - "path": "/nix/store/y78h7ccdy3jdy4mwyw8dyg3prhwqx61f-source", + "narHash": "sha256-NLfZri8QaYVDjLHfDAqP+DHyIRsb+bXn+2dJtoFo1LM=", + "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "type": "path" }, "original": { - "path": "/nix/store/y78h7ccdy3jdy4mwyw8dyg3prhwqx61f-source", + "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "type": "path" } }, @@ -116,12 +116,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-51K3gjUQAgBuXJMUCxloBqJeRiB5nwix0kMSbffDxak=", - "path": "/nix/store/y78h7ccdy3jdy4mwyw8dyg3prhwqx61f-source", + "narHash": "sha256-NLfZri8QaYVDjLHfDAqP+DHyIRsb+bXn+2dJtoFo1LM=", + "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "type": "path" }, "original": { - "path": "/nix/store/y78h7ccdy3jdy4mwyw8dyg3prhwqx61f-source", + "path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "type": "path" } }, diff --git a/tests/flake.nix b/tests/flake.nix index 7c6c143b..1b083b37 100644 --- a/tests/flake.nix +++ b/tests/flake.nix @@ -52,6 +52,10 @@ nixGrammars = false; }; }; + elixir-ls = build { + plugins.lsp.enable = true; + plugins.lsp.servers.elixirls.enable = true; + }; lsp-lines = build-stable { plugins.lsp-lines.enable = true;