projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.19.7
[grml-etc-core.git]
/
etc
/
tmux.conf
diff --git
a/etc/tmux.conf
b/etc/tmux.conf
index
0c55b57
..
a1ea76d
100644
(file)
--- a/
etc/tmux.conf
+++ b/
etc/tmux.conf
@@
-22,11
+22,16
@@
bind-key '\' confirm-before kill-session
### join the last active pane to the currently active window
bind-key j join-pane -s !
### join the last active pane to the currently active window
bind-key j join-pane -s !
+### join the marked pane to the currently active window
+### ('bind-key m select-pane -m' is default to mark the current pane)
+bind-key J join-pane
+
### Move current window to session named "bg" (and create session if it does not exist)
bind-key B if-shell "! tmux has-session -t bg" "new-session -d -s bg" \; move-window -t bg
### Reload Config
### Move current window to session named "bg" (and create session if it does not exist)
bind-key B if-shell "! tmux has-session -t bg" "new-session -d -s bg" \; move-window -t bg
### Reload Config
-bind-key R source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+ "bind-key R source-file ~/.tmux.conf \\; source-file -q ~/.tmux.conf.local \\; display-message '~/.tmux.conf[.local] reloaded'"
###rebind keys
bind-key h next-layout
###rebind keys
bind-key h next-layout
@@
-62,3
+67,7
@@
set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
set-window-option -g window-status-style fg=blue,bg=black
set-window-option -g window-status-current-style bold
set-window-option -g window-status-style fg=blue,bg=black
set-window-option -g window-status-current-style bold
+
+### source user-specific local configuration file
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+ "source-file -q ~/.tmux.conf.local"