From 9c7b322645b03355850594e2d4f71c09af899592 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sun, 4 Aug 2013 17:41:00 -0500
Subject: [PATCH] Clean up tmux theme and status info

---
 tmux/theme.sh          | 59 ++++++++++++++++++++++++++++++++++++++++++
 tmux/tmux.conf.symlink | 33 +++--------------------
 tmux/whack.tmuxcolors  | 32 -----------------------
 3 files changed, 63 insertions(+), 61 deletions(-)
 create mode 100644 tmux/theme.sh
 delete mode 100644 tmux/whack.tmuxcolors

diff --git a/tmux/theme.sh b/tmux/theme.sh
new file mode 100644
index 0000000..fe8dfac
--- /dev/null
+++ b/tmux/theme.sh
@@ -0,0 +1,59 @@
+#### COLOUR
+
+tm_color_active=colour201
+tm_color_inactive=colour11
+tm_color_feature=colour202
+
+# separators
+tm_separator_left_bold="◀"
+tm_separator_left_thin="❮"
+tm_separator_right_bold="▶"
+tm_separator_right_thin="❯"
+
+set -g status-left-length 32
+set -g status-right-length 150
+set -g status-interval 5
+
+
+# default statusbar colors
+# set-option -g status-bg colour0
+set-option -g status-fg $tm_color_active
+set-option -g status-bg default
+set-option -g status-attr default
+
+# default window title colors
+set-window-option -g window-status-fg $tm_color_inactive
+set-window-option -g window-status-bg default
+set -g window-status-format "#I #W"
+
+# active window title colors
+set-window-option -g window-status-current-fg $tm_color_active
+set-window-option -g window-status-current-bg default
+set-window-option -g  window-status-current-format "#[bold]#I #W"
+
+# pane border
+set-option -g pane-border-fg $tm_color_inactive
+set-option -g pane-active-border-fg $tm_color_active
+
+# message text
+set-option -g message-bg default
+set-option -g message-fg $tm_color_active
+
+# pane number display
+set-option -g display-panes-active-colour $tm_color_active
+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_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"
+
+set -g status-left $tm_session_name
+set -g status-right $tm_itunes' '$tm_rdio' '$tm_battery' '$tm_date
diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index 614a7cb..3cdca14 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -102,33 +102,8 @@ bind -t vi-copy 'y' copy-selection
 bind C-c run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
 bind C-v run "tmux set-buffer $(reattach-to-user-namespace pbpaste); tmux paste-buffer")
 
-######################
-### Color Settings ###
-######################
-
-source ~/.dotfiles/tmux/whack.tmuxcolors
-
-##################
-#### Plugins #####
-##################
-
-tm_spotify_track='#[fg=colour2]#(osascript ~/.dotfiles/applescripts/spotify.scpt)'
-tm_itunes_track='#[fg=colour27]#(osascript ~/.dotfiles/applescripts/itunes.scpt)'
-tm_rdio_track='#[fg=colour127]#(osascript ~/.dotfiles/applescripts/rdio.scpt)'
-
-tm_date='#[fg=colour212] %R %d %b'
-tm_host='#[fg=colour202,bold]#h'
-tm_session_name='#[fg=colour226,bold]♘ #S'
-tm_mail='#[fg=colour196,bold]✉ #(~/.dotfiles/applescripts/mail.scpt -ug)'
-tm_battery='#(~/.dotfiles/bin/battery_indicator.sh)'
-
-set -g status-left-length 32
-set -g status-right-length 150
-set -g status-interval 5
-set -g window-status-format "#[fg=colour239] #I #W "
-
-set -g window-status-current-format "#[fg=colour0,bg=colour26]#[fg=colour16,bg=colour26,noreverse,bold] #I #W #[fg=colour26,nobold]"
-# set -g window-status-current-format "#[fg=colour0]#[fg=colour202,noreverse,bold] #I #W #[fg=colour26,nobold]"
-set -g status-left $tm_session_name
-set -g status-right $tm_itunes_track' '$tm_rdio_track' '$tm_battery' '$tm_date' '$tm_host
+##############################
+### Color & Style Settings ###
+##############################
 
+source ~/.dotfiles/tmux/theme.sh
diff --git a/tmux/whack.tmuxcolors b/tmux/whack.tmuxcolors
deleted file mode 100644
index dbc32a5..0000000
--- a/tmux/whack.tmuxcolors
+++ /dev/null
@@ -1,32 +0,0 @@
-#### COLOUR
-
-# default statusbar colors
-# set-option -g status-bg colour0
-set-option -g status-fg colour26
-set-option -g status-bg default
-set-option -g status-attr default
-
-# default window title colors
-set-window-option -g window-status-fg colour244
-set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
-
-# active window title colors
-set-window-option -g window-status-current-fg colour26
-set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-attr bright
-
-# pane border
-set-option -g pane-border-fg colour245
-set-option -g pane-active-border-fg colour240
-
-# message text
-# set-option -g message-bg colour0
-set-option -g message-fg colour26
-
-# pane number display
-set-option -g display-panes-active-colour colour33
-set-option -g display-panes-colour colour166
-
-# clock
-set-window-option -g clock-mode-colour colour26