diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2016-04-23 02:50:12 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-04-23 02:50:12 +1200 |
commit | 374572486f07d375ad11ff9049e42b3bfe406d92 (patch) | |
tree | d7c9abfba68f3b5825d871349907fd0e6a0ee169 | |
parent | Add means to change prompt color (diff) | |
download | dotfiles-374572486f07d375ad11ff9049e42b3bfe406d92.tar.gz dotfiles-374572486f07d375ad11ff9049e42b3bfe406d92.zip |
Allow specifying color for tmux
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 19 | ||||
-rw-r--r-- | README.markdown | 4 | ||||
-rw-r--r-- | tmux/tmux.conf.m4 (renamed from tmux/tmux.conf) | 6 |
4 files changed, 23 insertions, 7 deletions
@@ -1 +1,2 @@ gnupg/gpg.conf +tmux/tmux.conf @@ -43,17 +43,28 @@ test-sh \ test-urxvt -all : gnupg +all : gnupg tmux clean : - rm -f gnupg/gpg.conf + rm -f \ + gnupg/gpg.conf \ + tmux/tmux.conf distclean : clean gnupg : gnupg/gpg.conf gnupg/gpg.conf : - m4 -D DOTFILES_HOME="$(HOME)" gnupg/gpg.conf.m4 > gnupg/gpg.conf + m4 -D DOTFILES_HOME="$(HOME)" \ + gnupg/gpg.conf.m4 > gnupg/gpg.conf + +TMUX_COLOR := colour237 + +tmux : tmux/tmux.conf + +tmux/tmux.conf : + m4 -D TMUX_COLOR="$(TMUX_COLOR)" \ + tmux/tmux.conf.m4 > tmux/tmux.conf install : install-bash \ install-curl \ @@ -184,7 +195,7 @@ install-terminfo : tic -- "$$info" ; \ done -install-tmux : +install-tmux : tmux/tmux.conf install -pm 0644 -- tmux/tmux.conf "$(HOME)"/.tmux.conf install-urxvt : test-urxvt diff --git a/README.markdown b/README.markdown index 2a8f1492..147d4428 100644 --- a/README.markdown +++ b/README.markdown @@ -253,6 +253,10 @@ Note that the configuration presently uses a hard-coded 256-color colorscheme, and uses non-login shells, with an attempt to control the environment to stop shells thinking they have access to an X display. +The configuration file is created with `m4(1)` to allow specifying a colour +theme. This is just because I use a different colour for my work session. The +default is a dark grey. + The configuration for Bash includes a `tmux` function designed to make `attach` into the default command if no arguments are given and sessions do already exist. The default command is normally `new-session`. diff --git a/tmux/tmux.conf b/tmux/tmux.conf.m4 index e9746671..ac19ebe3 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf.m4 @@ -116,8 +116,8 @@ set-option -g message-style "bg=colour18,fg=colour231" set-window-option -g mode-style "bg=colour18,fg=colour231" # Pane borders are always in dark gray -set-option -g pane-border-style "fg=colour237" -set-option -g pane-active-border-style "fg=colour237" +set-option -g pane-border-style "fg=TMUX_COLOR" +set-option -g pane-active-border-style "fg=TMUX_COLOR" # Inactive windows have a slightly grayed-out background and default text set-option -g window-style "bg=colour232,fg=colour248" @@ -125,7 +125,7 @@ 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=colour237,fg=colour248" +set-option -g status-style "bg=TMUX_COLOR,fg=colour248" # Titles of windows default to black text with no embellishment set-window-option -g window-status-style "fg=colour16" |