From 7e207c402e26189f982e5f5af73340b87e92db29 Mon Sep 17 00:00:00 2001
From: M1dgard <M1dgard@users.noreply.github.com>
Date: Mon, 3 Sep 2018 10:56:21 +0200
Subject: [PATCH] [zsh-theme] Fix issues

---
 midgard.zsh-theme | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/midgard.zsh-theme b/midgard.zsh-theme
index 6933467..9de0d4a 100644
--- a/midgard.zsh-theme
+++ b/midgard.zsh-theme
@@ -3,7 +3,8 @@
 function my_pwd {
 	# ~ for home; keep only the last two directories
 	echo $(echo "$PWD" | sed -r '
-		s,^'"$HOME"',~,
+		s,^'"$HOME"',~,; t reset; :reset
+		s|^~/git/my-cool-project/([^/])[^/]+/([^/]+)/|\1/\2/|; t end
 		s|^.+/([^/]*/[^/]*)$|\1|
 		:end')
 }
@@ -12,13 +13,13 @@ function my_retval {
 	RETVAL=$?
 
 	if [[ $RETVAL -eq 0 ]]; then
-		echo "$fg[yellow]"
+		echo "%{$fg[yellow]%}"
 	else
-		echo "$fg[red]$RETVAL "
+		echo "%{$fg[red]%}$RETVAL "
 	fi
 }
 
-PROMPT='%{$(my_retval)%}$(my_pwd)$(git_prompt_info)$(git_prompt_status) %{$reset_color%} '
+PROMPT='$(my_retval)$(my_pwd)$(git_prompt_info)$(git_prompt_status) %{$reset_color%} '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}  "
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
@@ -31,5 +32,7 @@ ZSH_THEME_GIT_PROMPT_RENAMED=" %{$fg[blue]%}➦"
 ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$fg[magenta]%}✂"
 ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$fg[grey]%}✱"
 
+ZSH_THEME_TERM_TAB_TITLE_IDLE="in %~" # NOT truncated PWD
+
 
 #  vim: set ft=zsh noet :