From faf304d5f4eb88e38452f86cec4c10a9aeb7b917 Mon Sep 17 00:00:00 2001
From: Adriano Bonat <adrianob@gmail.com>
Date: Sat, 28 Jul 2012 18:06:40 -0300
Subject: [PATCH 1/2] fixed robbyrussell theme to use bold colors.

---
 themes/robbyrussell/fish_prompt.fish | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/themes/robbyrussell/fish_prompt.fish b/themes/robbyrussell/fish_prompt.fish
index c32808d..2d0832b 100644
--- a/themes/robbyrussell/fish_prompt.fish
+++ b/themes/robbyrussell/fish_prompt.fish
@@ -1,14 +1,23 @@
 function fish_prompt
-  if [ (git_branch_name) ]
-    if [ (is_git_dirty) ]
-      set git_dirty "✗"
+  set -l cyan (set_color -o cyan)
+  set -l yellow (set_color -o yellow)
+  set -l red (set_color -o red)
+  set -l blue (set_color -o blue)
+  set -l normal (set_color normal)
 
-      printf '%s➜ %s %s git:(%s%s%s) %s ' (set_color red) (set_color blue) (basename (prompt_pwd)) (set_color red) (git_branch_name) (set_color blue) $git_dirty
-    else
-      printf '%s➜ %s %s git:(%s%s%s) ' (set_color red) (set_color blue) (basename (prompt_pwd)) (set_color red) (git_branch_name) (set_color blue)
+  set -l arrow "$red➜ "
+  set -l cwd $cyan(basename $PWD)
+
+  if [ (git_branch_name) ]
+    set -l git_branch $red(git_branch_name)
+    set git_info "$blue git:($git_branch$blue)"
+
+    if [ (is_git_dirty) ]
+      set -l dirty "$yellow ✗"
+      set git_info "$git_info$dirty"
     end
-  else
-    printf '%s➜ %s %s ' (set_color red) (set_color blue) (basename (prompt_pwd))
   end
+
+  echo -n -s $arrow $cwd $git_info $normal '>'
 end
 

From 38fcb0cf44369115fdadd68288fb6f180e5a898e Mon Sep 17 00:00:00 2001
From: Adriano Bonat <adrianob@gmail.com>
Date: Wed, 8 Aug 2012 23:32:45 -0300
Subject: [PATCH 2/2] using prompt_pwd instead of $PWD to show home as ~.

---
 themes/robbyrussell/fish_prompt.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/robbyrussell/fish_prompt.fish b/themes/robbyrussell/fish_prompt.fish
index 2d0832b..10c28ea 100644
--- a/themes/robbyrussell/fish_prompt.fish
+++ b/themes/robbyrussell/fish_prompt.fish
@@ -6,7 +6,7 @@ function fish_prompt
   set -l normal (set_color normal)
 
   set -l arrow "$red➜ "
-  set -l cwd $cyan(basename $PWD)
+  set -l cwd $cyan(basename (prompt_pwd))
 
   if [ (git_branch_name) ]
     set -l git_branch $red(git_branch_name)