From 75e32e473a190ab405ba3487324ee551bc31e4aa Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Tue, 24 Sep 2024 09:17:45 -0700
Subject: [PATCH] [zsh] Update init-env-python and init-env-playdate

---
 zsh/func/init-env-playdate | 15 +++++++++++++++
 zsh/func/init-env-python   | 15 +++++++++++++++
 zsh/func/init_env_playdate |  8 --------
 zsh/func/init_env_python   | 30 ------------------------------
 zshenv                     |  4 ++--
 5 files changed, 32 insertions(+), 40 deletions(-)
 create mode 100644 zsh/func/init-env-playdate
 create mode 100644 zsh/func/init-env-python
 delete mode 100644 zsh/func/init_env_playdate
 delete mode 100644 zsh/func/init_env_python

diff --git a/zsh/func/init-env-playdate b/zsh/func/init-env-playdate
new file mode 100644
index 0000000..b4927c8
--- /dev/null
+++ b/zsh/func/init-env-playdate
@@ -0,0 +1,15 @@
+#!/usr/bin/env zsh
+# Eryn Wells <eryn@erynwells.me>
+
+autoload -Uz prepend_to_path
+
+function init-env-playdate
+{
+    local -r sdk_path="$HOME/Developer/PlaydateSDK"
+    if [[ -d "$sdk_date" ]]; then
+        export PLAYDATE_SDK_PATH="$sdk_path"
+        prepend_to_path "$PLAYDATE_SDK_PATH/bin"
+    fi
+}
+
+init-env-playdate "$@"
diff --git a/zsh/func/init-env-python b/zsh/func/init-env-python
new file mode 100644
index 0000000..5f3da27
--- /dev/null
+++ b/zsh/func/init-env-python
@@ -0,0 +1,15 @@
+# Eryn Wells <eryn@erynwells.me>
+
+autoload -Uz prepend_to_path
+
+function init-env-python
+{
+    local -r user_python_root="$HOME/Library/Python"
+    if [[ -d "$pythonRoot" ]]; then
+        for f in $pythonRoot/*; do
+            prepend_to_path "$f/bin"
+        done
+    fi
+}
+
+init-env-python "$@"
diff --git a/zsh/func/init_env_playdate b/zsh/func/init_env_playdate
deleted file mode 100644
index 875fcef..0000000
--- a/zsh/func/init_env_playdate
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env zsh
-# Eryn Wells <eryn@erynwells.me>
-
-autoload prepend_to_path
-
-export PLAYDATE_SDK_PATH="$HOME/Developer/PlaydateSDK"
-
-prepend_to_path "$PLAYDATE_SDK_PATH/bin"
diff --git a/zsh/func/init_env_python b/zsh/func/init_env_python
deleted file mode 100644
index 577a2ac..0000000
--- a/zsh/func/init_env_python
+++ /dev/null
@@ -1,30 +0,0 @@
-# Eryn Wells <eryn@erynwells.me>
-
-autoload -Uz prepend_to_path
-
-init_env_python() {
-    local pythonRoot="$HOME/Library/Python"
-    if [[ -d "$pythonRoot" ]]; then
-        for f in $pythonRoot/*; do
-            prepend_to_path "$f/bin"
-        done
-    fi
-
-    local python27SitePackages="$pythonroot/2.7/lib/python/site-packages"
-    if [[ -d "$python27SitePackages" ]]; then
-        if [[ ! -z $PYTHONPATH ]]; then
-            PYTHONPATH=$python27SitePackages:$PYTHONPATH
-        else
-            PYTHONPATH=$python27SitePackages
-        fi
-    fi
-
-    export PYTHONPATH
-
-    if which virtualenvwrapper.sh &> /dev/null; then
-        export WORKON_HOME="$HOME/src/py/.envs"
-        source `which virtualenvwrapper.sh`
-    fi
-}
-
-init_env_python "$@"
diff --git a/zshenv b/zshenv
index 8b14948..1b03546 100644
--- a/zshenv
+++ b/zshenv
@@ -31,8 +31,8 @@ typeset -a zsh_init_env_functions=( \
     init-path \
     init-unix-env \
     init-zsh-helpers \
-    init_env_python \
-    init_env_playdate \
+    init-env-python \
+    init-env-playdate \
     init-vi \
     init_env_$SYS \
 )