pkgsets/python3: pkgs should be mergable function

pkgsets/python3.nix

@@ -1,25 +1,33 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:
-with lib;
+
 {
-  machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (
-    ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)
-  );
-  machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
-    bpython
-    flake8
-    genanki
-    matplotlib
-    mypy
-    mysqlclient
-    numpy
-    pandas
-    pillow
-    scipy
-    virtualenv
-  ];
+  machine.pkgsets.python3 = {
+    pkgwrap = pkgs.python3.withPackages (config.machine.pkgsets.python3.pkgs);
+    pkgs = ps: with ps; [
+      bpython
+      click
+      flake8
+      genanki
+      holidays
+      matplotlib
+      mypy
+      mysqlclient
+      numpy
+      pandas
+      pillow
+      pyaml
+      scipy
+      jupyter
+      jupyterlab
+      requests
+      pip
+      notebook
+      seaborn
+      virtualenv
+    ];
+  };
 }