Add jupyterlab back to being installed by default

Change jupyterlab/default.nix to just return a package set which is
then integrated with other python packages in default.nix

home/prog/default.nix

@@ -3,6 +3,8 @@
     "ruff/pyproject.toml".source = ./ruff.toml;
     "pypoetry/config.toml".source = ./pypoetry.toml;
     "ipython/profile_default/ipython_config.json".source = ./ipython_config.json;
+    "jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
+    "jupyter/jupyter_nbconvert_config.py".source = ./jupyter_nbconvert_config.py;
   };
   home.packages = with pkgs; [
     # Nix
@@ -23,7 +25,10 @@
 
     # Python
     (python3.withPackages
-      (ps: with ps; [python-lsp-server mypy isort]))
+      (ps:
+        with ps;
+          [python-lsp-server mypy isort]
+          ++ (ps.callPackage ./jupyter/default.nix {})))
     ruff
 
     # JavaScript / TypeScript

home/prog/jupyter/default.nix

@@ -1,16 +1,8 @@
-{pkgs, ...}: {
+{python, ...}:
-  xdg.configFile = {
+with python.pkgs; [
-    "jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
+  jupyterlab
-    "jupyter/jupyter_nbconvert_config.py".source =
+  jupyterlab-git
-      ./jupyter_nbconvert_config.py;
+  nbdime
-  };
+  nbconvert
-  home.packages = with pkgs; [
+  (callPackage ./catppuccin_jupyterlab/default.nix {})
-    (python3.withPackages
+]
-      (ps:
-        with ps; [
-          jupyterlab
-          jupyterlab-git
-          (callPackage ./catppuccin_jupyterlab/default.nix {})
-        ]))
-  ];
-}