44cad95ed220a3a3a0c76de15186f395fc6e7ab0

 1diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
 2index 10e019be0fd05bd6150044b38a9ebaac45f664f1..eef32e998221760ca1eea9a4bd13e7474dcd80fe 100644
 3--- a/themes/dallas.zsh-theme
 4+++ b/themes/dallas.zsh-theme
 5@@ -1,14 +1,26 @@
 6 # Personalized!
 7-# [red][normal][purple][yellow][normal]
 8-# dallas@lappy ~/Sites %
 9-# PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "
10-# PROMPT="{white}\{{yellow}{time}{white}\}{green}{host}{white}:{cyan}{pwd} {red,bold}{user}{white}%{normal} "
11 
12-DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%T%{$fg[white]%}}%{$reset_color%}"
13+# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
14+DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
15+# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
16 DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
17+# Grab the current machine name: muscato
18 DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
19-DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~%{$reset_color%}"
20+# Grab the current filepath, use shortcuts: ~/Desktop
21+# Append the current git branch, if in a git repository: ~aw@master
22+DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
23+# Grab the current username: dallas
24 DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
25-DALLAS_PROMPT_CHAR_="%{$fg[white]%}%%%{$reset_color%}"
26+# Use a % for normal users and a # for privelaged (root) users.
27+DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
28+# For the git prompt, use a white @ and blue text for the branch name
29+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
30+# Close it all off by resetting the color and styles.
31+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
32+# Do nothing if the branch is clean (no changes).
33+ZSH_THEME_GIT_PROMPT_CLEAN=""
34+# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
35+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗"
36 
37+# Put it all together!
38 PROMPT="$DALLAS_CURRENT_TIME_$DALLAS_CURRENT_RUBY_$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ "