2 files changed, 12 insertions, 42 deletions

diff --git a/core/tmux.conf b/core/tmux.conf
index b9a6cb1..0304e94 100644
--- a/core/tmux.conf
+++ b/core/tmux.conf
@@ -40,23 +40,20 @@ set -g status-right "#{?pane_in_mode,line #{e|+:#{scroll_position},#{e|-:#{e|-:#
 # (replaces the default prefix + / "describe key"); capture goes via a named buffer so it targets this pane
 bind-key / capture-pane -J -S - -b scrollback \; display-popup -E -w 99% -h 99% "f=\$(mktemp); tmux save-buffer -b scrollback \$f; tmux delete-buffer -b scrollback; vim -M -c 'set number' + \$f; rm -f \$f"
 
-# ===== Shared clipboard: RAM file /dev/shm/clip/buf on CLIP_HOST =====
+# ===== Clipboard: every yank goes to both places, neither blocks; prefix ] tries remote, then local =====
+# local: pbcopy on Mac, OSC 52 (set-clipboard on) everywhere; remote: RAM file /dev/shm/clip/buf on CLIP_HOST; copy-pipe runs as a background job
 %hidden CLIP_HOST="root@p.noml.ch"
-# One persistent ssh link (opens on first use, one key touch).
-# Close it: ssh -O exit -o ControlPath=~/.ssh/cm-%C <CLIP_HOST>
 %hidden CLIP="ssh -o ControlMaster=auto -o ControlPersist=yes -o ControlPath=~/.ssh/cm-%C -o ServerAliveInterval=30 -o ConnectTimeout=3 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR $CLIP_HOST"
-# 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'"
+%hidden YANK="f=\$(mktemp); cat >\$f; pbcopy <\$f 2>/dev/null; $CLIP 'umask 077; mkdir -p /dev/shm/clip && cat >/dev/shm/clip/new && mv /dev/shm/clip/new /dev/shm/clip/buf' <\$f >/dev/null 2>&1; rm -f \$f"
 bind-key -T copy-mode-vi v send-keys -X begin-selection
 # 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 (-p: bracketed paste, so vim inserts it as-is even from normal mode);
-# 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 -p"
-# ===== end shared clipboard =====
+# prefix + ] pastes remote buffer; any remote failure or >3 s = Mac clipboard (Linux: tmux buffer); -b keeps tmux responsive meanwhile
+bind-key ] run-shell -b "f=\$(mktemp); perl -e 'alarm 3; exec @ARGV' $CLIP '[ -f /dev/shm/clip/buf ] || exit 3; cat /dev/shm/clip/buf' >\$f 2>/dev/null || pbpaste >\$f 2>/dev/null || tmux save-buffer \$f; tmux load-buffer \$f; rm -f \$f; tmux paste-buffer -p -t '#{pane_id}'"
+# ===== end clipboard =====
 # OSC 52: copy-mode yanks also go to the clipboard of the terminal you type in; "on" (not "external")
 # also forwards OSC 52 that vim writes inside a pane
 set -g set-clipboard on
diff --git a/core/vimrc b/core/vimrc
index 26ebdb6..93608ce 100644
--- a/core/vimrc
+++ b/core/vimrc
@@ -60,44 +60,17 @@ nnoremap <silent> <leader>f :<C-U>LspDocumentFormat<CR>|       " \f: format file
 nnoremap <silent> <leader>em :<C-U>call ExpandMacro()<CR>|     " \em: expand macro under cursor
 
 
-" ===== Shared clipboard: RAM file /dev/shm/clip/buf on g:clip_host (same as tmux.conf) =====
+" ===== Clipboard: every yank goes to both places, neither blocks; paste is always local =====
+" local: OSC 52 sends @" to the terminal you type in (inside tmux needs set-clipboard on)
+" remote: background ssh job writes @" to RAM file /dev/shm/clip/buf on g:clip_host; failure is silent
 let g:clip_host = 'root@p.noml.ch'
-" One persistent ssh link (opens on first use, one key touch).
 let g:clip = ['ssh', '-o', 'ControlMaster=auto', '-o', 'ControlPersist=yes', '-o', 'ControlPath=~/.ssh/cm-%C', '-o', 'ServerAliveInterval=30', '-o', 'ConnectTimeout=3', '-o', 'StrictHostKeyChecking=no', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=ERROR', g:clip_host]
-" push (yank): every yank or delete sends @" in a background job
-augroup ssh_clipboard
+augroup clipboard
 au!
+au TextYankPost * call echoraw("\e]52;c;" . (exists('*str2blob') ? base64_encode(str2blob(split(@", "\n", 1))) : system("base64 | tr -d '\\n'", @")) . "\x07")
 au TextYankPost * let g:clip_job = job_start(g:clip + ['umask 077; mkdir -p /dev/shm/clip && cat >/dev/shm/clip/new && mv /dev/shm/clip/new /dev/shm/clip/buf'], {'in_io': 'pipe', 'out_io': 'null', 'err_io': 'null'}) | call ch_sendraw(g:clip_job, @") | call ch_close_in(g:clip_job)
-" also OSC 52: @" to the clipboard of the terminal you type in (inside tmux needs set-clipboard on)
-au TextYankPost * call echoraw("\e]52;c;" . system("base64 | tr -d '\\n'", @") . "\x07")
 augroup END
-" pull (paste): every p P gp gP ]p [p (normal) and p P (visual) first fetches the buffer into @".
-" Waits up to 3 s for a pending push, then up to 3 s for the fetch (perl alarm kills ssh);
-" no buffer on g:clip_host yet (exit 3, e.g. after its reboot) = normal local paste;
-" any other failure prints a message and skips the paste. Counts and "x register prefixes still work.
-function! ClipPull() abort
-  let l:i = 0
-  while exists('g:clip_job') && job_status(g:clip_job) ==# 'run' && l:i < 30
-    sleep 100m
-    let l:i += 1
-  endwhile
-  let l:out = system("perl -e 'alarm 3; exec @ARGV' " . join(g:clip) . " '[ -f /dev/shm/clip/buf ] || exit 3; cat /dev/shm/clip/buf'")
-  if v:shell_error == 3
-    return 1
-  elseif v:shell_error
-    echohl ErrorMsg | echo 'clip: pull from ' . g:clip_host . ' failed or took >3s, paste skipped' | echohl None
-    return 0
-  endif
-  call setreg('"', l:out)
-  return 1
-endfunction
-for s:k in ['p', 'P', 'gp', 'gP', ']p', '[p']
-  execute 'nnoremap <expr> ' . s:k . " ClipPull() ? '" . s:k . "' : ''"
-endfor
-for s:k in ['p', 'P']
-  execute 'xnoremap <expr> ' . s:k . " ClipPull() ? '" . s:k . "' : ''"
-endfor
-" ===== end shared clipboard =====
+" ===== end clipboard =====
 
 filetype plugin indent on