4 files changed, 44 insertions, 112 deletions

diff --git a/core/tmux.conf b/core/tmux.conf
index 465641c..97084f1 100644
--- a/core/tmux.conf
+++ b/core/tmux.conf
@@ -1,15 +1,41 @@
-# True-color support regardless of what TERM the outer terminal/distro sets
-set -g default-terminal "tmux-256color"
-set -ga terminal-overrides ",*256col*:Tc"
-
+# Ctrl-b f: prompt for text, list windows whose name, pane title or pane contents match; Enter jumps
+# Ctrl-b w: tree of every window in every session; press f inside it to filter by name, Enter jumps
+# Ctrl-b s: tree of sessions (same tree, session view)
+# Ctrl-b p: go to the previous window (lower index, wraps); Ctrl-b n goes to the next one
+#
 # Vi mode for copy
 setw -g mode-keys vi
 
 # Mouse selection
 set -g mouse on
 
+# Persistent pane index labels (top-left of each pane's border)
+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 '%%'"
+# Manual: :swap-pane -s <src> -t <dst>
+
+# Vim-style pane resizing (prefix + H/J/K/L), magnitude 1
+bind -r H resize-pane -L 1
+bind -r J resize-pane -D 1
+bind -r K resize-pane -U 1
+bind -r L resize-pane -R 1
+
 # v to start selection, y to yank (like vim)
 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 "openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1"
-bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-no-clear "openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1"
-bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1"
+# macOS: pbcopy. Linux: wl-copy/xclip when usable, else just drain (tmux's own
+# buffer + set-clipboard/OSC 52 still apply). Netcat send is the same on both.
+if-shell 'uname | grep -q Darwin' {
+  bind-key -T copy-mode-vi y send-keys -X copy-pipe-no-clear "bash -c 'tee >(pbcopy) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
+  bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-no-clear "bash -c 'tee >(pbcopy) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
+  bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "bash -c 'tee >(pbcopy) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
+} {
+  # Linux only: true-color regardless of what TERM the outer terminal/distro sets
+  set -g default-terminal "tmux-256color"
+  set -ga terminal-overrides ",*256col*:Tc"
+  bind-key -T copy-mode-vi y send-keys -X copy-pipe-no-clear "bash -c 'tee >(wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || cat >/dev/null) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
+  bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-no-clear "bash -c 'tee >(wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || cat >/dev/null) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
+  bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "bash -c 'tee >(wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || cat >/dev/null) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
+}
diff --git a/core/vim.sh b/core/vim.sh
index 8041e0e..241673e 100755
--- a/core/vim.sh
+++ b/core/vim.sh
@@ -2,71 +2,8 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")" || exit
 
+# Same vimrc as the Mac (core/vimrc); OS differences are guarded inside the file.
 VIMRC_PATH="/etc/vimrc"
 [ -d /etc/vim ] && VIMRC_PATH="/etc/vim/vimrc"
-CLIP_HOST="p.noml.ch"
-CLIP_PORT="5023"
-CLIP_CMD="openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 ${CLIP_HOST} ${CLIP_PORT}"
 
-grep -q 'netcat_clipboard' "$VIMRC_PATH" && exit 0
-
-cat << EOF >> "$VIMRC_PATH"
-augroup netcat_clipboard
-  au!
-  au TextYankPost * call system("echo " . shellescape(@") . " | ${CLIP_CMD} >/dev/null 2>&1 &")
-augroup END
-
-" Enable line wrapping
-set wrap
-
-" Optional: Make wrapped lines easier to read by indenting them
-set breakindent
-set breakindentopt=shift:1
-
-syntax on
-set mouse=a
-set expandtab
-set shiftwidth=4
-set softtabstop=4
-set tabstop=4
-set noautoindent
-set nosmartindent
-filetype plugin indent on
-
-set laststatus=2  " permanent status bar
-set statusline=%F  " shows full file path
-
-if (has("termguicolors"))
-  " tmux's terminfo entries (tmux-256color/screen-256color) don't define
-  " setrgbf/setrgbb, so vim has no termcap to build true-color escapes and
-  " silently emits none. Set them explicitly (standard vim+tmux fix).
-  if !empty($TMUX)
-    let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-    let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-  endif
-  set termguicolors
-endif
-
-"colorscheme murphy
-colorscheme zellner
-
-" Ctrl+A: Move to the beginning of the line in INSERT mode
-inoremap <C-a> <Home>
-
-" Ctrl+E: Move to the end of the line in INSERT mode
-inoremap <C-e> <End>
-
-" Ctrl+A: Move to the beginning of the line in NORMAL mode
-nnoremap <C-a> 0
-
-" Ctrl+E: Move to the end of the line in NORMAL mode
-nnoremap <C-e> $
-
-set number
-setlocal regexpengine=2
-set foldcolumn=12
-
-set noswapfile
-autocmd InsertLeave * silent! update
-
-EOF
+cp vimrc "$VIMRC_PATH"
diff --git a/mac/vimrc b/core/vimrc
index ba9bd88..b4441a5 100644
--- a/mac/vimrc
+++ b/core/vimrc
@@ -1,4 +1,5 @@
-" /etc/vim/vimrc — self-contained; source of truth: /v1/dev_env/core/vim.sh
+" One vimrc for Mac and Linux. Source of truth: /Users/xs/dev_env/core/vimrc
+" Mac: cp core/vimrc ~/.vimrc   Linux: sudo bash core/vim.sh (copies it to /etc/vimrc or /etc/vim/vimrc)
 " gt: go to next tab (right, wraps)
 " gT: go to previous tab (left, wraps)
 " 2gt: go to tab number 2 (counted from 1 at the left)
@@ -111,7 +112,10 @@ autocmd InsertLeave * silent! update
 function! s:LockIfManaged() abort
   if !exists('s:managed')
     let l:cargo = empty($CARGO_HOME) ? expand('~/.cargo') : $CARGO_HOME
-    let s:managed = [trim(system('rustup show home')), l:cargo . '/registry', l:cargo . '/git']
+    let s:managed = [l:cargo . '/registry', l:cargo . '/git']
+    if executable('rustup')
+      call add(s:managed, trim(system('rustup show home')))
+    endif
   endif
   for l:dir in s:managed
     if stridx(expand('%:p'), l:dir . '/') == 0
@@ -126,6 +130,8 @@ augroup managed_readonly
 augroup END
 
 
+" vim-plug is optional: skip the plugin block until plug.vim is installed (see Setup above)
+if filereadable(expand('~/.vim/autoload/plug.vim'))
 call plug#begin('~/.vim/plugged')
 Plug 'prabirshrestha/async.vim'
 Plug 'prabirshrestha/vim-lsp'
@@ -141,6 +147,7 @@ Plug 'airblade/vim-gitgutter'
 Plug 'preservim/nerdtree'
 Plug 'andymass/vim-matchup'
 call plug#end()
+endif
 
 let g:gitgutter_sign_column_always = 0
 
diff --git a/mac/tmux.conf b/mac/tmux.conf
deleted file mode 100644
index bd89157..0000000
--- a/mac/tmux.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Ctrl-b f: prompt for text, list windows whose name, pane title or pane contents match; Enter jumps
-# Ctrl-b w: tree of every window in every session; press f inside it to filter by name, Enter jumps
-# Ctrl-b s: tree of sessions (same tree, session view)
-# Ctrl-b p: go to the previous window (lower index, wraps); Ctrl-b n goes to the next one
-#
-# Vi mode for copy
-setw -g mode-keys vi
-
-# Mouse selection
-set -g mouse on
-
-# Persistent pane index labels (top-left of each pane's border)
-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 '%%'"
-# Manual: :swap-pane -s <src> -t <dst>
-
-# Vim-style pane resizing (prefix + H/J/K/L), magnitude 1
-bind -r H resize-pane -L 1
-bind -r J resize-pane -D 1
-bind -r K resize-pane -U 1
-bind -r L resize-pane -R 1
-
-# v to start selection, y to yank (like vim)
-bind-key -T copy-mode-vi v send-keys -X begin-selection
-# macOS: pbcopy. Linux: wl-copy/xclip when usable, else just drain (tmux's own
-# buffer + set-clipboard/OSC 52 still apply). Netcat send is the same on both.
-if-shell 'uname | grep -q Darwin' {
-  bind-key -T copy-mode-vi y send-keys -X copy-pipe-no-clear "bash -c 'tee >(pbcopy) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
-  bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-no-clear "bash -c 'tee >(pbcopy) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
-  bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "bash -c 'tee >(pbcopy) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
-} {
-  bind-key -T copy-mode-vi y send-keys -X copy-pipe-no-clear "bash -c 'tee >(wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || cat >/dev/null) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
-  bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-no-clear "bash -c 'tee >(wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || cat >/dev/null) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
-  bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "bash -c 'tee >(wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || cat >/dev/null) | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1'"
-}