update-flake: enable jupyter fully

Signed-off-by: John Titor <[email protected]>
JohnRTitor · Jan 6, 2025 · 0a95a3f · 0a95a3f
1 parent b6c504a
commit 0a95a3f
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 104 deletions.
diff --git a/dev-environment/jupyter.nix b/dev-environment/jupyter.nix
@@ -1,6 +1,9 @@
 {pkgs, ...}:
 {
-  services.jupyter.enable = true;
-  services.jupyter.password = "argon2:$argon2id$v=19$m=10240,t=10,p=8$PxYTOOaulhqndkeAsBaiVQ$cwS31ODwiduBmA59YYTfh2q8SbMBGH93iDjU5tcQ8kU"; # test
+  services.jupyter = {
+    enable = true;
+    password = "argon2:$argon2id$v=19$m=10240,t=10,p=8$PxYTOOaulhqndkeAsBaiVQ$cwS31ODwiduBmA59YYTfh2q8SbMBGH93iDjU5tcQ8kU";
+  };
+
   #services.jupyter.notebookDir = "Notebooks";
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,6 @@
     nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
     nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages
     nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs
-    nixpkgs-jupyter-service-fix.url = "github:nixos/nixpkgs/refs/pull/367106/merge";
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management

diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
@@ -8,7 +8,7 @@
 }: {
   imports = [
     #./amdgpu.nix # import modules here to test
-    "${inputs.nixpkgs-jupyter-service-fix}/nixos/modules/services/development/jupyter/default.nix"
+    "${inputs.nixpkgs-master}/nixos/modules/services/development/jupyter/default.nix"
   ];
 
   disabledModules = [