1 files changed, 14 insertions, 2 deletions

diff --git a/core/tmux.conf b/core/tmux.conf
index 2a0e161..d0d3ef8 100644
--- a/core/tmux.conf
+++ b/core/tmux.conf
@@ -14,7 +14,8 @@ set -g pane-border-status top
 set -g pane-border-format "#P"
 
 # Explicitly swap current pane with a pane index you type in
-bind-key P command-prompt -p "swap with pane #:" "swap-pane -d -t '%%'"
+bind-key S command-prompt -p "swap with pane #:" "swap-pane -d -t '%%'"
+bind-key P command-prompt -p "go to pane #:" "select-pane -t '%%'"
 # Manual: :swap-pane -s <src> -t <dst>
 
 # Vim-style pane resizing (prefix + H/J/K/L), magnitude 1
@@ -23,6 +24,14 @@ bind -r J resize-pane -D 1
 bind -r K resize-pane -U 1
 bind -r L resize-pane -R 1
 
+# Copy-mode cursor line (counted up from the bottom, matches the : goto-line prompt) in the status line;
+# the status bar redraws every second, the top-right copy-mode indicator does not follow the cursor
+# : goto-line only scrolls the view; also put the cursor on the bottom row so the status line shows the typed number
+bind-key -T copy-mode-vi : command-prompt -p "(goto line)" { send-keys -X goto-line "%%" ; send-keys -X bottom-line }
+set -g status-interval 1
+set -g status-right-length 70
+set -g status-right "#{?pane_in_mode,line #{e|+:#{scroll_position},#{e|-:#{e|-:#{pane_height},1},#{copy_cursor_y}}}/#{history_size}  ,}\"#{=21:pane_title}\" %H:%M %d-%b-%y"
+
 # ===== Shared clipboard: RAM file /dev/shm/clip/buf on CLIP_HOST =====
 %hidden CLIP_HOST="root@p.noml.ch"
 # One persistent ssh link (opens on first use, one key touch).
@@ -31,13 +40,16 @@ bind -r L resize-pane -R 1
 # push (yank): copy mode v to select, then y / Enter / mouse drag
 %hidden YANK="$CLIP 'umask 077; mkdir -p /dev/shm/clip && cat >/dev/shm/clip/new && mv /dev/shm/clip/new /dev/shm/clip/buf'"
 bind-key -T copy-mode-vi v send-keys -X begin-selection
-bind-key -T copy-mode-vi y send-keys -X copy-pipe-no-clear "$YANK"
+# y = yank selection; with no selection, y y = yank the whole line
+bind-key -T copy-mode-vi y if-shell -F '#{selection_present}' { send-keys -X copy-pipe-no-clear "$YANK" } { switch-client -T copy-yy }
+bind-key -T copy-yy y send-keys -X select-line \; send-keys -X copy-pipe-no-clear "$YANK"
 bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-no-clear "$YANK"
 bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "$YANK"
 # pull (paste): prefix + ] fetches the buffer into tmux, then pastes it;
 # no buffer on CLIP_HOST yet (exit 3, e.g. after its reboot) = paste tmux's own buffer
 bind-key ] run-shell "f=\$(mktemp); $CLIP '[ -f /dev/shm/clip/buf ] || exit 3; cat /dev/shm/clip/buf' >\$f; r=\$?; [ \$r -eq 0 ] && tmux load-buffer \$f; rm -f \$f; [ \$r -eq 0 ] || [ \$r -eq 3 ] && tmux paste-buffer"
 # ===== end shared clipboard =====
+# TODO: try `set -g set-clipboard off` later (tmux default "external" sends copies to the local terminal clipboard via OSC 52); unrelated to the shared clipboard above
 
 # Linux only: true-color regardless of what TERM the outer terminal/distro sets
 if-shell 'uname | grep -q Darwin' {} {