bind-key space next-window
bind-key C-space next-window
bind-key K confirm-before kill-pane
-bind-key \\ confirm-before kill-session
+bind-key '\' confirm-before kill-session
#bind-key C-h previous-window
### 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
-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
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"