From bfc8fe696c2b641e2da46abd10b34aad6605f24d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 3 Aug 2013 11:16:19 -0400
Subject: [PATCH] Prompt turns green in CMD mode, instead

---
 zsh/prompt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zsh/prompt b/zsh/prompt
index 537abe6e..958826d8 100644
--- a/zsh/prompt
+++ b/zsh/prompt
@@ -29,8 +29,8 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}+%{$fg[white]%}"
 ##################
 
 prompt_vimode() {
-    MODE_INDICATOR="-- COMMAND -- "
-    echo -n "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+    MODE_INDICATOR=" %{$fg[green]%}\$ "
+    echo -n "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/ \$ }"
 }
 
 prompt() {
@@ -47,14 +47,14 @@ prompt() {
     # The prompt
     echo -n "%{$fg[red]%}"
     echo -n "%{$FX[bold]%}"
-    echo -n ' $ '
-    echo -n "%{$reset_color%}"
 
+    echo -n '$(prompt_vimode)'
+    # echo -n ' $ '
+
+    echo -n "%{$reset_color%}"
 }
 
 rprompt() {
-    echo -n '$(prompt_vimode)'
-
     # Make the rprompt a bright grey to set it apart
     echo -n "%{$FG[245]%}"
     echo -n '$(prompt_pwd)'