diff --git a/shell-modules/default.nix b/shell-modules/default.nix
index 55ba908..9a4b561 100644
--- a/shell-modules/default.nix
+++ b/shell-modules/default.nix
@@ -9,6 +9,7 @@ let
     ./shell.nix
     ./languages/python.nix
     ./utilities/cuda.nix
+    ./utilities/jupyter.nix
   ];
 in
 {
diff --git a/shell-modules/utilities/jupyter.nix b/shell-modules/utilities/jupyter.nix
new file mode 100644
index 0000000..0d70103
--- /dev/null
+++ b/shell-modules/utilities/jupyter.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+{
+  options.jupyter = {
+    enable = mkEnableOption "Jupyter";
+  };
+
+  config = mkIf config.jupyter.enable {
+    python.enable = mkDefault true;
+
+    python.packages =
+      p: with p; [
+        jupyter
+        notebook
+      ];
+  };
+}
diff --git a/user-modules/development/language/jupyter.nix b/user-modules/development/language/jupyter.nix
index 15c5b4d..438528c 100644
--- a/user-modules/development/language/jupyter.nix
+++ b/user-modules/development/language/jupyter.nix
@@ -17,14 +17,14 @@ in
 
   config = mkIf cfg.enable {
     # Development packages
-    home.packages = with pkgs; [
-      evcxr
-    ];
+    # home.packages = with pkgs; [
+    #   evcxr
+    # ];
 
-    modules.python.extraPythonPackages = p: [
-      p.jupyter
-      p.notebook
-    ];
+    # modules.python.extraPythonPackages = p: [
+    #   p.jupyter
+    #   p.notebook
+    # ];
 
     # VSCode configuration
     programs.vscode = {
diff --git a/user-modules/development/language/rust.nix b/user-modules/development/language/rust.nix
index 85749d2..d3100b5 100644
--- a/user-modules/development/language/rust.nix
+++ b/user-modules/development/language/rust.nix
@@ -26,6 +26,7 @@ in
       # rust-analyzer
       # rustfmt
       # clippy
+      evcxr
     ];
 
     # VSCode configuration