From 681aa230d836c8a89fb2eec6c645f4f14cbdc42f Mon Sep 17 00:00:00 2001
From: Cody Horst <chorst@uw.edu>
Date: Tue, 14 Aug 2018 20:40:28 -0700
Subject: [PATCH] add support for conda

---
 themes/zork/zork.theme.bash | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/zork/zork.theme.bash b/themes/zork/zork.theme.bash
index 75bc17d6..07f30e12 100644
--- a/themes/zork/zork.theme.bash
+++ b/themes/zork/zork.theme.bash
@@ -57,7 +57,12 @@ chroot(){
 
 # show virtualenvwrapper
 my_ve(){
-    if [ -n "$VIRTUAL_ENV" ]
+
+    if [ -n "$CONDA_DEFAULT_ENV" ]
+    then
+        my_ps_ve="${bold_purple}${CONDA_DEFAULT_ENV}${normal}";
+        echo "($my_ps_ve)";
+    elif [ -n "$VIRTUAL_ENV" ]
     then 
         my_ps_ve="${bold_purple}$ve${normal}";
         echo "($my_ps_ve)";