Update, remove deprecated Jupyter flake

5 files changed, 21 insertions, 120 deletions

diff --git a/flake.lock b/flake.lock
index 5f622cf..64abfef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731315605,
-        "narHash": "sha256-a38eEP2aWC/XtiIAuR3yX3mXnxBb2C/QCRhWqwlLajQ=",
+        "lastModified": 1732352436,
+        "narHash": "sha256-DInAgNnQT0ArMfyZZ4GUIqq8B/wGS/9Y3DEntAbtan4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8bb826ff3ad7dd473f69c518272ae56d5f917a52",
+        "rev": "bb0acd64336552d7ed16bc7e2cd0ddfec65fdcbe",
         "type": "github"
       },
       "original": {
@@ -20,21 +20,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1623660459,
-        "narHash": "sha256-OTmOsh43po7r5F9s9H6lVCBQ2b0FikWbmiwLbMAGRdw=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "98c8d36b1828009b20f12544214683c7489935a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -56,33 +41,13 @@
         "type": "github"
       }
     },
-    "jupyter": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1628121465,
-        "narHash": "sha256-eQzY+yymJzIVRYx58Kim21AfS1v8eTTkiLj3ZtPW4Nc=",
-        "owner": "GTrunSec",
-        "repo": "jupyterWith",
-        "rev": "efbbc51cf4551cb3625ed47761368f02dcccf39b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GTrunSec",
-        "ref": "flakes",
-        "repo": "jupyterWith",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {
@@ -94,11 +59,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1731797254,
+        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
         "type": "github"
       },
       "original": {
@@ -110,21 +75,6 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1623393771,
-        "narHash": "sha256-UMqgWzS0IEqsosffjL0P621dixn5ncE9unNylpUB9Zs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a5d03577f0161c8a6e713b928ca44d9b3feb2c37",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "rev": "a5d03577f0161c8a6e713b928ca44d9b3feb2c37",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
         "lastModified": 1629271619,
         "narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=",
         "owner": "NixOS",
@@ -141,7 +91,7 @@
     },
     "personal": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1629652608,
@@ -161,7 +111,6 @@
       "inputs": {
         "emacs": "emacs",
         "home-manager": "home-manager",
-        "jupyter": "jupyter",
         "personal": "personal",
         "stable": "stable",
         "unstable": "unstable"
@@ -169,11 +118,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1731797254,
+        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
         "type": "github"
       },
       "original": {
@@ -185,11 +134,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1730958623,
-        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
+        "lastModified": 1731890469,
+        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
+        "rev": "5083ec887760adfe12af64830a66807423a859a7",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e9a3ee2..f0886c7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,22 +10,17 @@
       inputs = { nixpkgs.follows = "stable"; };
     };
     emacs.url = github:nix-community/emacs-overlay/master;
-    jupyter.url = github:GTrunSec/jupyterWith/flakes;
   };
 
   outputs = {
-    self, stable, unstable, personal, emacs, home-manager, jupyter, ...
+    self, stable, unstable, personal, emacs, home-manager, ...
   }: let
     system = "x86_64-linux";
 
-    jupyter-overlay = (final: prev: {
-      jupyterWith = jupyter.defaultPackage."${final.system}";
-    });
-
     pkgs = import stable {
       inherit system;
       config = { allowUnfree = true; };
-      overlays = [ jupyter-overlay emacs.overlay ];
+      overlays = [ emacs.overlay ];
     };
 
     pkgs-unstable = import unstable {
diff --git a/gui/apps/web.nix b/gui/apps/web.nix
index 9c4e09c..41fc878 100644
--- a/gui/apps/web.nix
+++ b/gui/apps/web.nix
@@ -1,12 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs-unstable, ... }:
 
 {
   home = {
     packages = [
       pkgs.tdesktop
-      pkgs.zotero
       pkgs.tigervnc
       pkgs.remmina
+
+      pkgs-unstable.zotero
     ];
   };
 
diff --git a/module/tasker.nix b/module/tasker.nix
index 112da88..4f2e0fe 100644
--- a/module/tasker.nix
+++ b/module/tasker.nix
@@ -11,22 +11,6 @@ let
     #!/bin/sh
     exec ${pkgs.kitty}/bin/kitty -d ${dir} ${cmd}
   '';
-  launchJupyterInDirectory = dir: jupyter: ''
-    #!/usr/bin/env fish
-
-    for port in (seq 9000 9100)
-      if not ss --listening --oneline --tcp --no-header | awk '{ split($4, port, ":"); print port[2]+0 }' | grep -q $port
-        set free_port $port
-        break
-      end
-    end
-
-    set token (head /dev/urandom | tr -dc A-Za-z0-9 | head -c 40)
-    ${jupyter}/bin/jupyter-lab --no-browser --port=$free_port --NotebookApp.token=$token &
-    sleep 2
-    ${pkgs.chromium}/bin/chromium --app="http://localhost:$free_port/?token=$token"
-    kill (jobs -lp)
-  '';
 
   taskivations = pkgs.lib.mapAttrsToList (name: conf: let
     command = pkgs.writeTextFile {
@@ -43,12 +27,6 @@ let
         environment = launchTerminalInDirectory conf.directory ''
           nix-shell ${builtins.unsafeDiscardStringContext conf.environment.drvPath} --command fish
         '';
-
-        python-console = launchCommandInDirectory "~/" ''
-          nix-shell ${builtins.unsafeDiscardStringContext conf.environment.drvPath} --command jupyter-qtconsole
-        '';
-
-        jupyter-lab = launchJupyterInDirectory conf.directory conf.environment;
       };
     };
 
diff --git a/tasks/default.nix b/tasks/default.nix
index 9e641c3..04013c2 100644
--- a/tasks/default.nix
+++ b/tasks/default.nix
@@ -12,7 +12,6 @@ let
   mkPythonShellDerivation = n: ps: init: pkgs.stdenvNoCC.mkDerivation rec {
     name = n;
     buildInputs = [(pkgs.python3.withPackages (python-packages: with python-packages; ps ++ [
-      jupyterlab
       qtconsole
     ]))];
     shellHook = let
@@ -27,10 +26,6 @@ let
     '';
   };
 
-  mkJupyterEnv = kernel: pkgs.jupyterWith.jupyterlabWith {
-    kernels = [ kernel ];
-  };
-
 in {
   custom.tasks = {
     cpp_shell = {
@@ -64,22 +59,5 @@ in {
         biber
       ]);
     };
-
-    pymath_jupyter = {
-      description = "Python for mathematics @ Jupyter Lab";
-      directory = "~/";
-      type = "jupyter-lab";
-      environment = mkJupyterEnv (
-        pkgs.jupyterWith.kernels.iPythonWith {
-          name = "python";
-          packages = p: with p; [
-            numpy
-            sympy
-            scipy
-            matplotlib
-          ];
-        }
-      );
-    };
   };
 }