aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-06-15 09:43:12 +1200
committerTom Ryder <tom@sanctum.geek.nz>2017-06-15 09:43:12 +1200
commit051e1c22e9e29931068e342acad8ce690fa2a9a9 (patch)
treee6d8f238f13373c342dfde7ad76d2acdc3297db2
parent98cb922f49580e9e991db0e3f1f311eebbd5ac63 (diff)
downloaddotfiles-051e1c22e9e29931068e342acad8ce690fa2a9a9.tar.gz
dotfiles-051e1c22e9e29931068e342acad8ce690fa2a9a9.zip
Restore previous TMUX_BG/FG vars
Bad decision
-rw-r--r--Makefile4
-rw-r--r--tmux/tmux.conf.mi56
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 182396db..50c1b939 100644
--- a/Makefile
+++ b/Makefile
@@ -311,8 +311,8 @@ TMUX_FG = colour248
tmux/tmux.conf: tmux/tmux.conf.m4
m4 \
- -D BG=$(TMUX_BG) \
- -D FG=$(TMUX_FG) \
+ -D TMUX_BG=$(TMUX_BG) \
+ -D TMUX_FG=$(TMUX_FG) \
tmux/tmux.conf.m4 > $@
install: install-bin \
diff --git a/tmux/tmux.conf.mi5 b/tmux/tmux.conf.mi5
index 8893cd3e..671523dc 100644
--- a/tmux/tmux.conf.mi5
+++ b/tmux/tmux.conf.mi5
@@ -110,15 +110,15 @@ set-option -g message-style "bg=colour18,fg=colour231"
set-window-option -g mode-style "bg=colour18,fg=colour231"
# Pane borders are always in the background color
-set-option -g pane-border-style "fg=<% BG %>"
-set-option -g pane-active-border-style "fg=<% BG %>"
+set-option -g pane-border-style "fg=<% TMUX_BG %>"
+set-option -g pane-active-border-style "fg=<% TMUX_BG %>"
# Inactive windows have slightly washed-out system colours
set-option -g window-style "bg=colour232,fg=colour248"
set-option -g window-active-style "bg=colour0,fg=colour15"
# The status bar has the defined background and foreground colours
-set-option -g status-style "bg=<% BG %>,fg=<% FG %>"
+set-option -g status-style "bg=<% TMUX_BG %>,fg=<% TMUX_FG %>"
# Titles of windows default to black text with no embellishment
set-window-option -g window-status-style "fg=colour16"