From 36b6728053d181fb5e918736edaa184866152e8b Mon Sep 17 00:00:00 2001
From: Timo Geissler <geissler@twaice.com>
Date: Fri, 5 Jun 2020 12:00:58 +0200
Subject: [PATCH] added new prompt updates

---
 fish/theme-t31m/fish_prompt.fish       |  6 +++---
 fish/theme-t31m/fish_right_prompt.fish |  1 +
 fish/theme-t31m/t31m_prompt.fish       | 21 ++++++++++++++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/fish/theme-t31m/fish_prompt.fish b/fish/theme-t31m/fish_prompt.fish
index e48f907..c8ad80a 100644
--- a/fish/theme-t31m/fish_prompt.fish
+++ b/fish/theme-t31m/fish_prompt.fish
@@ -15,13 +15,13 @@ function fish_prompt
 		set -l branch (git::branch_name ^/dev/null)
 		set -l ref (git show-ref --head --abbrev | awk '{print substr($0,0,7)}' | sed -n 1p)
 
+        printf '%s ' \U1F6E0
+		echo -n -s (red)"("(off)
+
 		if git::is_stashed
 			echo -n -s (white)"^"(off)
 		end
 
-        printf '%s ' \U1F6E0
-		echo -n -s (red)"("(off)
-
 		if git::is_dirty
 			printf (white)"*"(off)
 		end
diff --git a/fish/theme-t31m/fish_right_prompt.fish b/fish/theme-t31m/fish_right_prompt.fish
index dcbde51..d0a9c7a 100644
--- a/fish/theme-t31m/fish_right_prompt.fish
+++ b/fish/theme-t31m/fish_right_prompt.fish
@@ -100,6 +100,7 @@ function fish_right_prompt
 		end
 	end
 
+	# Because of having a two line promt now we dont need right anymore so we dont print anything here atm
 	#printf (yellow)"("(off)$cwd(yellow)") "(off)
 	#printf (off)(date +%H(yellow):(off)%M(yellow):(off)%S)(off)"\n"
 
diff --git a/fish/theme-t31m/t31m_prompt.fish b/fish/theme-t31m/t31m_prompt.fish
index 9036474..9b99c68 100644
--- a/fish/theme-t31m/t31m_prompt.fish
+++ b/fish/theme-t31m/t31m_prompt.fish
@@ -1,8 +1,10 @@
 function prompt::awsenv
     if test -n "$env"
         if [ $env = "prod" ]
+            printf '%s ' \U2601
             echo -n -s (yellow)"["(red)"$env"(yellow)"]"(off)
         else
+            printf '%s ' \U2601
             echo -n -s (yellow)"["(off)"$env"(yellow)"]"(off)
         end
     end
@@ -10,17 +12,26 @@ end
 
 function prompt::pyenv
     if test -n "$PYENV_VERSION"
-        echo -n -s (yellow)"["(cyan)"$PYENV_VERSION"(yellow)"]"(off)
+        echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)"$PYENV_VERSION"(off)"@"(python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")(yellow)"]"(off)
+    else if test (command -v pyenv)
+        echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(pyenv version-name | sed 's/:.*$//' )(off)"@"(python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")(yellow)"]"(off)
+    else if test (command -v python)
+       echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")(yellow)"]"(off) 
     end
 end
 
 function t31m_prompt
+
     set awsenv (prompt::awsenv)
     set pyenv (prompt::pyenv) 
-    #echo -n -s (red)"$awsenv"(cyan)"$pyenv"
     echo -n -s "$pyenv"
-    printf '%s ' \U2601
     echo -n -s "$awsenv"
+
+    # get time since last command finished
+	if test $CMD_DURATION
+        # Show duration of the last command in seconds
+        set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.3fs", $1 / $2}')
+        printf '%s ' \U23F1
+        echo -n -s (red)$duration(off)
+    end
 end
-
-