diff --git a/home/prog/default.nix b/home/prog/default.nix index 2f681f44..672ef84b 100644 --- a/home/prog/default.nix +++ b/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 diff --git a/home/prog/catppuccin_jupyterlab/default.nix b/home/prog/jupyter/catppuccin_jupyterlab/default.nix similarity index 100% rename from home/prog/catppuccin_jupyterlab/default.nix rename to home/prog/jupyter/catppuccin_jupyterlab/default.nix diff --git a/home/prog/jupyter/default.nix b/home/prog/jupyter/default.nix index ef0bffa3..a10f97ed 100644 --- a/home/prog/jupyter/default.nix +++ b/home/prog/jupyter/default.nix @@ -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; [ - jupyterlab - jupyterlab-git - (callPackage ./catppuccin_jupyterlab/default.nix {}) - ])) - ]; -} +{python, ...}: +with python.pkgs; [ + jupyterlab + jupyterlab-git + nbdime + nbconvert + (callPackage ./catppuccin_jupyterlab/default.nix {}) +] diff --git a/home/prog/jupyter/jupyter_nbconvert_config.py b/home/prog/jupyter_nbconvert_config.py similarity index 100% rename from home/prog/jupyter/jupyter_nbconvert_config.py rename to home/prog/jupyter_nbconvert_config.py diff --git a/home/prog/jupyter/jupyter_server_config.py b/home/prog/jupyter_server_config.py similarity index 100% rename from home/prog/jupyter/jupyter_server_config.py rename to home/prog/jupyter_server_config.py