From ba97bf6a21d1135892f7b0944018b4851415d8c4 Mon Sep 17 00:00:00 2001
From: Determinant <tederminant@gmail.com>
Date: Wed, 20 May 2020 18:00:34 -0400
Subject: clean up the code

---
 tmux-colortag.tmux | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/tmux-colortag.tmux b/tmux-colortag.tmux
index d5310c6..2bc0d4b 100755
--- a/tmux-colortag.tmux
+++ b/tmux-colortag.tmux
@@ -19,18 +19,35 @@ tmux setw -g window-status-activity-style bg=colour237,fg=colour248,none
 tmux setw -g window-status-bell-style bg=colour237,fg=colour248,none
 tmux setw -g window-status-separator ""
 
+color0=colour237
+color1=colour239
+color2=colour255
+color3=colour246
+color4=colour248
+color5=colour241
+
+RECOVER_BG="#[bg=$color0]"
+LEFTBAR_FORMAT="#{?client_prefix,#[fg=$color5]#[bg=$color4],#[fg=$color4]#[bg=$color5]} #S#{?client_prefix,#[fg=$color4],#[fg=$color5]}"
+RIGHTBAR_DEFAULT="#[fg=$color3,bg=$color1]"
+RIGHTBAR_HOST="#[fg=$color0,bg=$color4]"
+LOAD_DISP="#(awk '{print \$1, \$2, \$3}' /proc/loadavg)"
+TAB_COLOR="#(\"$CURRENT_DIR/name2color.py\" #W)"
+TAB_NORMAL_BEGIN="#[fg=$color0,bg=$TAB_COLOR]"
+TAB_END="#[fg=$TAB_COLOR,bg=$color0]"
+TAB_FOCUS_BEGIN="#[fg=$color2,bg=$TAB_COLOR]"
+
 if [[ "$TMUX_COLORTAG_NOPOWERLINE" == yes ]]; then
-    tmux set -g status-left "#{?client_prefix,#[fg=colour241]#[bg=colour248],#[fg=colour248]#[bg=colour241]} #S#{?client_prefix,#[fg=colour248],#[fg=colour241]} #[bg=colour237] "
-    tmux set -g status-right "#[fg=colour239,bg=colour237] #[fg=colour246,bg=colour239] #(awk '{print \$1, \$2, \$3}' /proc/loadavg) #[fg=colour248,bg=colour239] #[fg=colour237,bg=colour248] #h "
-    tmux setw -g window-status-format "#[fg=colour237,bg=#(\"$CURRENT_DIR/name2color.py\" #W)] #I|#[fg=colour237,bg=#(\"$CURRENT_DIR/name2color.py\" #W)]#W #[fg=#(\"$CURRENT_DIR/name2color.py\" #W),bg=colour237] "
-    tmux setw -g window-status-current-format "#[fg=colour255,bg=#(\"$CURRENT_DIR/name2color.py\" #W)] #I|#[fg=colour255,bg=#(\"$CURRENT_DIR/name2color.py\" #W)]#W #[fg=#(\"$CURRENT_DIR/name2color.py\" #W),bg=colour237] "
+    tmux set -g status-left  "${LEFTBAR_FORMAT} ${RECOVER_BG} "
+    tmux set -g status-right "${RIGHTBAR_DEFAULT} ${LOAD_DISP} ${RIGHTBAR_HOST} #h "
+    tmux setw -g window-status-format "${TAB_NORMAL_BEGIN} #I|#W ${TAB_END} "
+    tmux setw -g window-status-current-format "${TAB_FOCUS_BEGIN} #I|#W ${TAB_END} "
 else
     TMUX_ARROW_SYMBOL_L1="${TMUX_ARROW_SYMBOL_L1:-$(printf '\ue0b6')}"
     TMUX_ARROW_SYMBOL_L2="${TMUX_ARROW_SYMBOL_L2:-$(printf '\ue0b7')}"
     TMUX_ARROW_SYMBOL_R1="${TMUX_ARROW_SYMBOL_R1:-$(printf '\ue0b4')}"
     TMUX_ARROW_SYMBOL_R2="${TMUX_ARROW_SYMBOL_R2:-$(printf '\ue0b5')}"
     
-    tmux set -g status-left "#{?client_prefix,#[fg=colour241]#[bg=colour248],#[fg=colour248]#[bg=colour241]} #S#{?client_prefix,#[fg=colour248],#[fg=colour241]}#[bg=colour237]$TMUX_ARROW_SYMBOL_R1 "
+    tmux set -g status-left "${LEFTBAR_FORMAT}${RECOVER_BG}${TMUX_ARROW_SYMBOL_R1} "
     tmux set -g status-right "#[fg=colour239,bg=colour237]$TMUX_ARROW_SYMBOL_L1#[fg=colour246,bg=colour239] #(awk '{print \$1, \$2, \$3}' /proc/loadavg) #[fg=colour248,bg=colour239]$TMUX_ARROW_SYMBOL_L1#[fg=colour237,bg=colour248] #h "
     tmux setw -g window-status-format "#[fg=colour237,bg=#(\"$CURRENT_DIR/name2color.py\" #W)]$TMUX_ARROW_SYMBOL_R1#[fg=colour237,bg=#(\"$CURRENT_DIR/name2color.py\" #W)] #I$TMUX_ARROW_SYMBOL_R2#[fg=colour237,bg=#(\"$CURRENT_DIR/name2color.py\" #W)]#W#[fg=#(\"$CURRENT_DIR/name2color.py\" #W),bg=colour237]$TMUX_ARROW_SYMBOL_R1 "
     tmux setw -g window-status-current-format "#[fg=colour237,bg=#(\"$CURRENT_DIR/name2color.py\" #W)]$TMUX_ARROW_SYMBOL_R1#[fg=colour255,bg=#(\"$CURRENT_DIR/name2color.py\" #W)] #I$TMUX_ARROW_SYMBOL_R2#[fg=colour255,bg=#(\"$CURRENT_DIR/name2color.py\" #W)]#W#[fg=#(\"$CURRENT_DIR/name2color.py\" #W),bg=colour237]$TMUX_ARROW_SYMBOL_R1 "
-- 
cgit v1.2.3