From 971b5c1c8df133810f56de8ee55f7da924b39db6 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Fri, 3 Mar 2023 13:49:01 +0100
Subject: [PATCH] Python LSP setup

---
 hm_modules/development/python.nix | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/hm_modules/development/python.nix b/hm_modules/development/python.nix
index f5d0c3e..1ca69c4 100644
--- a/hm_modules/development/python.nix
+++ b/hm_modules/development/python.nix
@@ -1,9 +1,20 @@
-{ pkgs, lib, config, ... }: {
-  home.packages = [ pkgs.black pkgs.python3 ]
-    ++ lib.optionals config.programs.helix.enable builtins.attrValues {
-    inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort;
-  } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
-    inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort;
-  };
+{ pkgs, lib, config, ... }:
+
+let
+  py = pkgs.python3;
+  pyPkgs = py.pkgs;
+in
+{
+  home.packages = [ py pyPkgs.black ]
+    ++ lib.optionals config.programs.helix.enable ([
+    pyPkgs.python-lsp-server
+    pyPkgs.pyls-flake8
+    pyPkgs.pyls-isort
+  ] ++ pyPkgs.python-lsp-server.optional-dependencies.all)
+    ++ lib.optionals config.programs.kakoune.enable ([
+    pyPkgs.python-lsp-server
+    pyPkgs.pyls-flake8
+    pyPkgs.pyls-isort
+  ] ++ pyPkgs.python-lsp-server.optional-dependencies.all);
   programs.neovim.withPython3 = true;
 }