From 15b96e387c937cec28c771cb16bea9fcb80c18a2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 10 Feb 2025 10:05:48 +0000
Subject: [PATCH] Rename pyshell to pythonWrapped

Focus just on wrapping python for venv creation (using copies) rather
than being activated every time
---
 .../{pyshell.nix => pythonWrapped.nix}           | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
 rename system/home/programming/{pyshell.nix => pythonWrapped.nix} (59%)

diff --git a/system/home/programming/pyshell.nix b/system/home/programming/pythonWrapped.nix
similarity index 59%
rename from system/home/programming/pyshell.nix
rename to system/home/programming/pythonWrapped.nix
index 830b8568..265935fe 100644
--- a/system/home/programming/pyshell.nix
+++ b/system/home/programming/pythonWrapped.nix
@@ -1,7 +1,6 @@
 {
   pkgs ? import <nixpkgs> { },
   python3 ? pkgs.python3Full,
-  extraPackages ? [ ],
   extraLibs ? [ ],
 }:
 let
@@ -25,17 +24,4 @@ let
     '';
   };
 in
-pkgs.mkShellNoCC {
-  packages = [
-    pythonWrapped
-    pkgs.uv
-  ] ++ extraPackages;
-  shellHook = ''
-    if [ ! -d .venv ]; then
-      ${pythonWrapped}/bin/python3 -m venv .venv
-    else
-      ${pythonWrapped}/bin/python3 -m venv --upgrade .venv
-    fi
-    [ -f .venv/bin/activate ] && source .venv/bin/activate
-  '';
-}
+pkgs.mkShellNoCC { packages = [ pythonWrapped ]; }