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
This commit is contained in:
Evie Litherland-Smith 2024-04-10 11:58:23 +01:00
parent d9aec4706a
commit 456b9a475c
5 changed files with 14 additions and 17 deletions

View file

@ -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

View file

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