summaryrefslogtreecommitdiffstats
path: root/usecases
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2021-07-16 09:42:09 +0200
committerMinijackson <minijackson@riseup.net>2021-07-16 09:42:09 +0200
commite541f2d5e772db7a0a9d30ac66d1f8a13153763b (patch)
tree3dbcaa90a14a2fd937ca1aa2bad44234358cb9b0 /usecases
parent93b4a1fc5acb65ed5aca789e35d95f729663e6e3 (diff)
downloadnixos-config-reborn-e541f2d5e772db7a0a9d30ac66d1f8a13153763b.tar.gz
nixos-config-reborn-e541f2d5e772db7a0a9d30ac66d1f8a13153763b.zip
dev: switch pyls -> pylsp with nixpkgs fix
Diffstat (limited to 'usecases')
-rw-r--r--usecases/desktop/development.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index 3bcfe82..7c797fe 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -12,7 +12,10 @@ let
12 12
13 vimPlugins; 13 vimPlugins;
14 14
15 inherit (pkgs.unstable.python3Packages) python-language-server; 15 #inherit (pkgs.unstable.python3Packages) python-lsp-server;
16 python-lsp-server = (pkgs.unstable.python3Packages.python-lsp-server.overrideAttrs (old: {
17 propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.unstable.python3Packages.setuptools ];
18 }));
16 19
17 luaFormat = inputs.self.lib.generators.lua { }; 20 luaFormat = inputs.self.lib.generators.lua { };
18 21
@@ -76,7 +79,7 @@ in
76 lsp = { 79 lsp = {
77 clangd.cmd = [ "${clang-tools}/bin/clangd" "--resource-dir=${clang}/resource-root" ]; 80 clangd.cmd = [ "${clang-tools}/bin/clangd" "--resource-dir=${clang}/resource-root" ];
78 elixirls.cmd = [ "${elixir_ls}/bin/elixir-ls" ]; 81 elixirls.cmd = [ "${elixir_ls}/bin/elixir-ls" ];
79 pyls.cmd = [ "${python-language-server}/bin/pyls" ]; 82 pylsp.cmd = [ "${python-lsp-server}/bin/pylsp" ];
80 sumneko_lua.cmd = [ "${sumneko-lua-language-server}/bin/lua-language-server" ]; 83 sumneko_lua.cmd = [ "${sumneko-lua-language-server}/bin/lua-language-server" ];
81 }; 84 };
82 85