From d114261894c071704ae0036bc06f2aa6ad8daedc Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Tue, 8 Apr 2014 23:16:51 -0500
Subject: [PATCH] correct tmux theme script and update colors

* update colors and correct variable usage in tmux theme file
* update colors in battery indicator script
---
 bin/battery_indicator.sh |  4 ++--
 tmux/theme.sh            | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bin/battery_indicator.sh b/bin/battery_indicator.sh
index 8c7fbc9..202cffe 100755
--- a/bin/battery_indicator.sh
+++ b/bin/battery_indicator.sh
@@ -17,10 +17,10 @@ if [[ $charged_slots -gt 3 ]]; then
   charged_slots=3
 fi
 
-echo -n '#[fg=red]'
+echo -n '#[fg=colour196]'
 for i in `seq 1 $charged_slots`; do echo -n "$HEART"; done
 
 if [[ $charged_slots -lt 3 ]]; then
-  echo -n '#[fg=white]'
+  echo -n '#[fg=colour254]'
   for i in `seq 1 $(echo "3-$charged_slots" | bc)`; do echo -n "$HEART"; done
 fi
diff --git a/tmux/theme.sh b/tmux/theme.sh
index 26fb611..8a44f64 100644
--- a/tmux/theme.sh
+++ b/tmux/theme.sh
@@ -1,8 +1,10 @@
 #### COLOUR
 
-tm_color_active=colour201
+tm_icon="♟"
+tm_color_active=colour118
 tm_color_inactive=colour241
-tm_color_feature=colour202
+tm_color_feature=colour4
+tm_color_music=colour203
 
 # separators
 tm_separator_left_bold="◀"
@@ -46,14 +48,14 @@ set-option -g display-panes-colour $tm_color_inactive
 # clock
 set-window-option -g clock-mode-colour $tm_color_active
 
-tm_spotify='#[fg=$tm_color_feature]#(osascript ~/.dotfiles/applescripts/spotify.scpt)'
-tm_itunes='#[fg=$tm_color_feature]#(osascript ~/.dotfiles/applescripts/itunes.scpt)'
-tm_rdio='#[fg=$tm_color_feature]#(osascript ~/.dotfiles/applescripts/rdio.scpt)'
-tm_battery='#(~/.dotfiles/bin/battery_indicator.sh)'
+tm_spotify="#[fg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/spotify.scpt)"
+tm_itunes="#[fg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/itunes.scpt)"
+tm_rdio="#[fg=$tm_color_music]#(osascript ~/.dotfiles/applescripts/rdio.scpt)"
+tm_battery="#(~/.dotfiles/bin/battery_indicator.sh)"
 
-tm_date='#[fg=$tm_color_inactive] %R %d %b'
-tm_host='#[fg=colour202,bold]#h'
-tm_session_name="#[fg=$tm_color_feature,bold]$tm_separator_right_thin #S"
+tm_date="#[fg=$tm_color_inactive] %R %d %b"
+tm_host="#[fg=$tm_color_feature,bold]#h"
+tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S"
 
 set -g status-left $tm_session_name
-set -g status-right $tm_itunes' '$tm_rdio' '$tm_battery' '$tm_date
+set -g status-right $tm_itunes' '$tm_rdio' '$tm_battery' '$tm_date' '$tm_host