From 1f4104ffdaaede1721090aa4ca752bf1d66172a0 Mon Sep 17 00:00:00 2001
From: alexrah <alexrah@gmail.com>
Date: Sun, 16 Feb 2014 17:49:08 +0100
Subject: [PATCH 1/3] created new theme mixing dst & kphoen

---
 themes/dstkph.zsh-theme | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 themes/dstkph.zsh-theme

diff --git a/themes/dstkph.zsh-theme b/themes/dstkph.zsh-theme
new file mode 100644
index 000000000..c87a33390
--- /dev/null
+++ b/themes/dstkph.zsh-theme
@@ -0,0 +1,56 @@
+# ------------------------------------------------------------------------------
+#          FILE:  kphoen.zsh-theme
+#   DESCRIPTION:  oh-my-zsh theme file.
+#        AUTHOR:  Kévin Gomez (geek63@gmail.com)
+#       VERSION:  1.0.0
+#    SCREENSHOT:
+# ------------------------------------------------------------------------------
+
+
+# Function to display command prompt: "$" for normal users, red "#" for root user
+function prompt_char {
+      if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+      }
+
+if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
+    PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%})
+%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)
+ $(prompt_char) '
+
+    ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
+    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    # display exitcode on the right when >0
+    return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
+
+    RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}%{$fg[green]%}[%*]%{$reset_color%}'
+
+    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚ "
+    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹ "
+    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖ "
+    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜ "
+    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═ "
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭ "
+else
+    PROMPT='[%n@%m:%~$(git_prompt_info)]
+%# '
+
+    ZSH_THEME_GIT_PROMPT_PREFIX=" "
+    ZSH_THEME_GIT_PROMPT_SUFFIX=""
+    ZSH_THEME_GIT_PROMPT_DIRTY="!"
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    # display exitcode on the right when >0
+    return_code="%(?..%? ↵ )"
+
+    RPROMPT='${return_code}$(git_prompt_status)'
+
+    ZSH_THEME_GIT_PROMPT_ADDED=" ✚ "
+    ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹ "
+    ZSH_THEME_GIT_PROMPT_DELETED=" ✖ "
+    ZSH_THEME_GIT_PROMPT_RENAMED=" ➜ "
+    ZSH_THEME_GIT_PROMPT_UNMERGED=" ═ "
+    ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭ "
+fi

From 01b9ab11545948309c95fd4285b0b6ee4be66543 Mon Sep 17 00:00:00 2001
From: alexrah <alexrah@gmail.com>
Date: Sun, 16 Feb 2014 17:55:44 +0100
Subject: [PATCH 2/3] updated author and file description

---
 themes/dstkph.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/dstkph.zsh-theme b/themes/dstkph.zsh-theme
index c87a33390..37a77a0c6 100644
--- a/themes/dstkph.zsh-theme
+++ b/themes/dstkph.zsh-theme
@@ -1,7 +1,7 @@
 # ------------------------------------------------------------------------------
-#          FILE:  kphoen.zsh-theme
+#          FILE:  dstkph.zsh-theme
 #   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Kévin Gomez (geek63@gmail.com)
+#        AUTHOR:  Ale Sandro (git@alexrah.otherinbox.com)
 #       VERSION:  1.0.0
 #    SCREENSHOT:
 # ------------------------------------------------------------------------------

From 0aac6b0d056967de98aafdf0e3341b4d0af79956 Mon Sep 17 00:00:00 2001
From: alexrah <alexrah@gmail.com>
Date: Mon, 17 Feb 2014 21:38:43 +0100
Subject: [PATCH 3/3] changed star color for git modified status

---
 themes/dstkph.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/dstkph.zsh-theme b/themes/dstkph.zsh-theme
index 37a77a0c6..5e2a05d50 100644
--- a/themes/dstkph.zsh-theme
+++ b/themes/dstkph.zsh-theme
@@ -32,7 +32,7 @@ if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
     ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖ "
     ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜ "
     ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═ "
-    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭ "
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[yellow]%} ✭ "
 else
     PROMPT='[%n@%m:%~$(git_prompt_info)]
 %# '