fix docker machine status, better git status

2 files changed, 15 insertions, 12 deletions

diff --git a/zsh/.zsh/custom/plugins/docker-machine/docker-machine-prompt.bash b/zsh/.zsh/custom/plugins/docker-machine/docker-machine-prompt.bash
index 0a6e43a..d7815e5 100644
--- a/zsh/.zsh/custom/plugins/docker-machine/docker-machine-prompt.bash
+++ b/zsh/.zsh/custom/plugins/docker-machine/docker-machine-prompt.bash
@@ -20,28 +20,28 @@
 __docker_machine_ps1 () {
     local format=${1:- [%s]}
     if test ${DOCKER_MACHINE_NAME}; then
-        local status
+        local machine_status=''
         if test ${DOCKER_MACHINE_PS1_SHOWSTATUS:-false} = true; then
-            status=$(docker-machine status ${DOCKER_MACHINE_NAME})
-            case ${status} in
+            machine_status=$(docker-machine status ${DOCKER_MACHINE_NAME})
+            case ${machine_status} in
                 Running)
-                    status=' R'
+                    machine_status=' R'
                     ;;
                 Stopping)
-                    status=' R->S'
+                    machine_status=' R->S'
                     ;;
                 Starting)
-                    status=' S->R'
+                    machine_status=' S->R'
                     ;;
                 Error|Timeout)
-                    status=' E'
+                    machine_status=' E'
                     ;;
                 *)
                     # Just consider everything elase as 'stopped'
-                    status=' S'
+                    machine_status=' S'
                     ;;
             esac
         fi
-        printf -- "${format}" "${DOCKER_MACHINE_NAME}${status}"
+        printf -- "${format}" "${DOCKER_MACHINE_NAME}${machine_status}"
     fi
 }
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2aa0ce4..2cc4ef1 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -48,7 +48,7 @@ ZSH_CUSTOM=$HOME/.zsh/custom
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git git-extras docker docker-compose docker-machine gpg-agent pep8 pip pyenv pylint python web-search wd)
+plugins=(git git-extras git-prompt docker docker-compose docker-machine gpg-agent pep8 pip pyenv pylint python web-search wd)
 
 ZSH=~/.oh-my-zsh
 
@@ -136,8 +136,11 @@ show_virtual_env() {
   fi
 }
 
-#PS1='$(show_virtual_env)'$PS1
-PS1="$PS1 $(__docker_machine_ps1)"
+PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%1~%{$reset_color%}$(__docker_machine_ps1)]%# '
+
+# Configure git prompt colors
+# https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/git-prompt/git-prompt.plugin.zsh#L76
+ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[cyan]%}%{✚%G%}"  # default is blue and hard to see
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh