diff --git a/tmux.1-8.conf b/tmux.1-8.conf deleted file mode 100644 index 3269488..0000000 --- a/tmux.1-8.conf +++ /dev/null @@ -1,2 +0,0 @@ -bind s split-window -v # horizontal window split -bind v split-window -h # vertical window split diff --git a/tmux.1-9.conf b/tmux.1-9.conf deleted file mode 100644 index a3cd133..0000000 --- a/tmux.1-9.conf +++ /dev/null @@ -1,3 +0,0 @@ -unbind c; bind c new-window -c "#{pane_current_path}" -bind s split-window -v -c "#{pane_current_path}" -bind v split-window -h -c "#{pane_current_path}" diff --git a/tmux.conf b/tmux.conf index 79aac46..351837b 100644 --- a/tmux.conf +++ b/tmux.conf @@ -57,13 +57,12 @@ bind + resize-pane -U 10 # status bar stuff set -g status on -set -g status-bg colour236 -set -g status-fg white set -g status-left '#[fg=green]#H' -set-window-option -g window-status-current-bg white -set-window-option -g window-status-current-fg black set-option -g status-right '%Y-%m-%d @ %k:%M' -# because the new tmux is inadequate -source-file ~/.tmux.1-9.conf -if-shell "[[ `tmux -V` == *1.8 ]]" 'source-file ~/.tmux.1-8.conf' +# 1.9 stuff moved in here +unbind c; bind c new-window -c "#{pane_current_path}" +bind s split-window -v -c "#{pane_current_path}" +bind v split-window -h -c "#{pane_current_path}" +set -g window-status-current-style bg=white,fg=black +set -g status-style fg=white,bg=colour236