From 583a5b5e0b9554ec20740ac2c7051dcf93cf62a6 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Sat, 1 Jun 2019 16:54:24 -0500
Subject: [PATCH] * usr/share/byobu/profiles/tmux:   - flatten some of our
 color configuration to match the new tmux format

---
 debian/changelog              |  2 ++
 usr/share/byobu/profiles/tmux | 26 +++++++-------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70399bfd..c3ff24c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ byobu (5.128) unreleased; urgency=medium
     - https://github.com/dustinkirkland/byobu/pull/30
   * usr/lib/byobu/wifi_quality:
     - prefer iwconfig over iw for now, iw is not working for me
+  * usr/share/byobu/profiles/tmux:
+    - flatten some of our color configuration to match the new tmux format
 
   [ Fede Luzzi ]
   * usr/lib/byobu/include/mondrian, usr/share/byobu/profiles/tmux:
diff --git a/usr/share/byobu/profiles/tmux b/usr/share/byobu/profiles/tmux
index f22aaba2..20858444 100644
--- a/usr/share/byobu/profiles/tmux
+++ b/usr/share/byobu/profiles/tmux
@@ -39,8 +39,7 @@ set-window-option -g xterm-keys on
 
 #set-option -g set-titles on
 #set-option -g set-titles-string '#(whoami)@#H - byobu (#S)'
-set-option -g pane-active-border-style bg=$BYOBU_HIGHLIGHT
-set-option -g pane-active-border-style fg=$BYOBU_HIGHLIGHT
+set-option -g pane-active-border-style bg=$BYOBU_HIGHLIGHT,fg=$BYOBU_HIGHLIGHT
 set-option -g pane-border-style fg=$BYOBU_ACCENT
 set-option -g history-limit 100000
 set-option -g display-panes-time 150
@@ -49,21 +48,12 @@ set-option -g display-panes-active-colour $BYOBU_HIGHLIGHT
 set-option -g clock-mode-colour $BYOBU_ACCENT
 set-option -g clock-mode-style 24
 set-option -g mode-keys vi
-set-option -g mode-style bg=$BYOBU_ACCENT
-set-option -g mode-style fg=$BYOBU_LIGHT
+set-option -g mode-style bg=$BYOBU_ACCENT,fg=$BYOBU_LIGHT
 
 set-window-option -g window-status-style default
-set-window-option -g window-status-style bg=$BYOBU_DARK
-set-window-option -g window-status-style fg=$BYOBU_LIGHT
-set-window-option -g window-status-current-style reverse
-set-window-option -g window-status-current-style bg=$BYOBU_DARK
-set-window-option -g window-status-current-style fg=$BYOBU_LIGHT
-#set-window-option -g window-status-alert-style bg=$BYOBU_DARK
-#set-window-option -g window-status-alert-style fg=$BYOBU_LIGHT
-#set-window-option -g window-status-alert-style bold
-set-window-option -g window-status-activity-style bg=$BYOBU_DARK
-set-window-option -g window-status-activity-style fg=$BYOBU_LIGHT
-set-window-option -g window-status-activity-style bold
+set-window-option -g window-status-style bg=$BYOBU_DARK,fg=$BYOBU_LIGHT
+set-window-option -g window-status-current-style bg=$BYOBU_DARK,fg=$BYOBU_LIGHT,reverse
+set-window-option -g window-status-activity-style bg=$BYOBU_DARK,fg=$BYOBU_LIGHT,bold
 set-window-option -g automatic-rename on
 set-window-option -g aggressive-resize on
 set-window-option -g monitor-activity on
@@ -79,12 +69,10 @@ set -g terminal-overrides 'xterm*:smcup@:rmcup@'
 #set -g default-command 'exec byobu-shell'
 set -g default-command $SHELL
 
-set -g status-style bg=$BYOBU_DARK
-set -g status-style fg=$BYOBU_LIGHT
+set -g status-style bg=$BYOBU_DARK,fg=$BYOBU_LIGHT
 set -g status-interval 1
 set -g status-left-length 256
 set -g status-right-length 256
 set -g status-left '#(byobu-status tmux_left)'
 set -g status-right '#(byobu-status tmux_right)'$BYOBU_DATE$BYOBU_TIME
-set -g message-style bg=$BYOBU_ACCENT
-set -g message-style fg=white
+set -g message-style bg=$BYOBU_ACCENT,fg=white