aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IDEAS.markdown2
-rw-r--r--Makefile5
-rw-r--r--tmux/tmux.conf.m413
3 files changed, 9 insertions, 11 deletions
diff --git a/IDEAS.markdown b/IDEAS.markdown
index b47977a4..39d9511e 100644
--- a/IDEAS.markdown
+++ b/IDEAS.markdown
@@ -10,5 +10,3 @@ Ideas
* Convert all the manual pages to mandoc maybe? <https://en.wikipedia.org/wiki/Mandoc>
* Add "pop" and "shift" methods to path()
* edio(1df), like vipe(1)
-* Allow specifying foreground and background colours for tmux configuration
- files; would be useful for work
diff --git a/Makefile b/Makefile
index 34be0053..e16dc944 100644
--- a/Makefile
+++ b/Makefile
@@ -137,10 +137,11 @@ mutt/muttrc : mutt/muttrc.m4
-D DOTFILES_SENDMAIL="$(SENDMAIL)" \
mutt/muttrc.m4 > mutt/muttrc
-TMUX_COLOR := colour237
+TMUX_BG := colour237
+TMUX_FG := colour248
tmux/tmux.conf : tmux/tmux.conf.m4
- m4 -D TMUX_COLOR="$(TMUX_COLOR)" \
+ m4 -D TMUX_BG="$(TMUX_BG)" -D TMUX_FG="$(TMUX_FG)" \
tmux/tmux.conf.m4 > tmux/tmux.conf
.awk :
diff --git a/tmux/tmux.conf.m4 b/tmux/tmux.conf.m4
index a4af9f8e..4e3cce4d 100644
--- a/tmux/tmux.conf.m4
+++ b/tmux/tmux.conf.m4
@@ -112,17 +112,16 @@ set-option -g message-style "bg=colour18,fg=colour231"
# Window choosers are white on blue
set-window-option -g mode-style "bg=colour18,fg=colour231"
-# Pane borders are always in dark gray
-set-option -g pane-border-style "fg=TMUX_COLOR"
-set-option -g pane-active-border-style "fg=TMUX_COLOR"
+# Pane borders are always in the background color
+set-option -g pane-border-style "fg=TMUX_BG"
+set-option -g pane-active-border-style "fg=TMUX_BG"
-# Inactive windows have a slightly grayed-out background and default text
+# 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 defaults to light gray on dark gray, which applies to the left
-# and right status bar sections described in status-left and status-right above
-set-option -g status-style "bg=TMUX_COLOR,fg=colour248"
+# The status bar has the defined background and foreground colours
+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"