refactor: add mkPoertyKernel

examples/python/science/default.nix

@@ -1,11 +1,23 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: let
+  cfg-science-example = config.kernel.python.science-example;
+in {
   kernel.python.science-example = {
     enable = true;
-    extraPackages = ps: [
-      ps.numpy
-      ps.scipy
-      # issue with matplotlib
-      # ps.matplotlib
-    ];
+    env = cfg-science-example.nixpkgs.python3.withPackages (ps:
+      with ps; [
+        ps.ipykernel
+        ps.scipy
+        ps.matplotlib
+      ]);
+    # extraPackages = ps: [
+    #   ps.numpy
+    #   ps.scipy
+    #   # issue with matplotlib
+    #   # ps.matplotlib
+    # ];
   };
 }

examples/python/science/test.ipynb

@@ -8,7 +8,8 @@
    "outputs": [],
    "source": [
     "import numpy as np\n",
-    "import scipy as sp"
+    "import scipy as sp\n",
+    "import matplotlib as mpl"
    ]
   },
   {

lib/jupyter.nix

@@ -184,7 +184,15 @@
   */
   mkJupyterlabEval = customModule:
     pkgs.lib.evalModules {
-      specialArgs = {inherit self system mkJupyterlab mkKernel;};
+      specialArgs = {
+        inherit
+          self
+          system
+          mkJupyterlab
+          mkKernel
+          ;
+        mkPoetryKernel = import ../modules/poetry.nix;
+      };
       modules = lib.flatten (
         [../modules]
         ++ lib.optional (customModule != null) customModule

modules/kernels/bash/default.nix

@@ -1,20 +1,18 @@
 {
+  mkPoetryKernel,
   config,
-  system,
-  mkKernel,
   ...
-} @ args:
-import ./../../poetry.nix {
-  inherit mkKernel;
-
-  argvKernelName = "bash_kernel";
-  codemirrorMode = "shell";
-  language = "bash";
-
-  kernelName = "bash";
-  requiredRuntimePackages = [
-    config.nixpkgs.bashInteractive
-    config.nixpkgs.coreutils
+}: {
+  imports = [
+    (mkPoetryKernel {
+      argvKernelName = "bash_kernel";
+      codemirrorMode = "shell";
+      language = "bash";
+      kernelName = "bash";
+      requiredRuntimePackages = [
+        config.nixpkgs.bashInteractive
+        config.nixpkgs.coreutils
+      ];
+    })
   ];
 }
-args

modules/kernels/c/default.nix

@@ -1,19 +1,17 @@
 {
+  mkPoetryKernel,
   config,
-  system,
-  mkKernel,
   ...
-} @ args:
-import ./../../poetry.nix {
-  inherit mkKernel;
-
-  argvKernelName = "jupyter_c_kernel";
-  codemirrorMode = "clike";
-  language = "c";
-
-  requiredRuntimePackages = [
-    config.nixpkgs.stdenv.cc
+}: {
+  imports = [
+    (mkPoetryKernel {
+      argvKernelName = "jupyter_c_kernel";
+      codemirrorMode = "clike";
+      language = "c";
+      requiredRuntimePackages = [
+        config.nixpkgs.stdenv.cc
+      ];
+      kernelName = "c";
+    })
   ];
-  kernelName = "c";
 }
-args

modules/kernels/elm/default.nix

@@ -1,19 +1,17 @@
 {
+  mkPoetryKernel,
   config,
-  system,
-  mkKernel,
   ...
-} @ args:
-import ./../../poetry.nix {
-  inherit mkKernel;
-
-  argvKernelName = "elm_kernel";
-  codemirrorMode = "elm";
-  language = "elm";
-
-  requiredRuntimePackages = [
-    config.nixpkgs.elmPackages.elm
+}: {
+  imports = [
+    (mkPoetryKernel {
+      argvKernelName = "elm_kernel";
+      codemirrorMode = "elm";
+      language = "elm";
+      requiredRuntimePackages = [
+        config.nixpkgs.elmPackages.elm
+      ];
+      kernelName = "elm";
+    })
   ];
-  kernelName = "elm";
 }
-args

modules/kernels/postgres/default.nix

@@ -1,16 +1,14 @@
 {
+  mkPoetryKernel,
   config,
-  system,
-  mkKernel,
   ...
-} @ args:
-import ./../../poetry.nix {
-  inherit mkKernel;
-
-  argvKernelName = "postgres_kernel";
-  codemirrorMode = "pgsql";
-  language = "postgres";
-
-  kernelName = "postgres";
+}: {
+  imports = [
+    (mkPoetryKernel {
+      argvKernelName = "postgres_kernel";
+      codemirrorMode = "pgsql";
+      language = "postgres";
+      kernelName = "postgres";
+    })
+  ];
 }
-args

modules/kernels/python/default.nix

@@ -1,15 +1,12 @@
-{
-  config,
-  mkKernel,
-  ...
-} @ args:
-import ./../../poetry.nix {
-  inherit mkKernel;
-
-  argvKernelName = "ipykernel_launcher";
-  codemirrorMode = "python";
-  language = "python";
-
-  kernelName = "python";
+{mkPoetryKernel, ...}: {
+  imports = [
+    (
+      mkPoetryKernel {
+        argvKernelName = "ipykernel_launcher";
+        codemirrorMode = "python";
+        language = "python";
+        kernelName = "python";
+      }
+    )
+  ];
 }
-args

modules/kernels/zsh/default.nix

@@ -1,20 +1,18 @@
 {
+  mkPoetryKernel,
   config,
-  system,
-  mkKernel,
   ...
-} @ args:
-import ./../../poetry.nix {
-  inherit mkKernel;
-
-  argvKernelName = "zsh_jupyter_kernel";
-  codemirrorMode = "shell";
-  language = "zsh";
-
-  requiredRuntimePackages = [
-    config.nixpkgs.zsh
-    config.nixpkgs.coreutils
+}: {
+  imports = [
+    (mkPoetryKernel {
+      argvKernelName = "zsh_jupyter_kernel";
+      codemirrorMode = "shell";
+      language = "zsh";
+      requiredRuntimePackages = [
+        config.nixpkgs.zsh
+        config.nixpkgs.coreutils
+      ];
+      kernelName = "zsh";
+    })
   ];
-  kernelName = "zsh";
 }
-args

modules/poetry.nix

@@ -1,7 +1,6 @@
 {
   kernelName,
   requiredRuntimePackages ? [],
-  mkKernel,
   argvKernelName,
   codemirrorMode,
   language,
@@ -10,6 +9,7 @@
   system,
   config,
   lib,
+  mkKernel,
   ...
 }: let
   inherit (lib) types;