From e948c6648b27fdceb34437e6694bdf35b5df1c37 Mon Sep 17 00:00:00 2001
From: yage <yage@yage.io>
Date: Tue, 5 Sep 2023 10:40:47 -0600
Subject: [PATCH] config updates

---
 bin/vim              |  11 ++++++++++-
 config/tmux.conf     |   5 +++++
 vim/en.utf-8.add     |   1 +
 vim/en.utf-8.add.spl | Bin 1476 -> 1477 bytes
 zsh/alias            |  25 ++++++++++++++++++++++++-
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/bin/vim b/bin/vim
index 443799f..e04e7dc 100755
--- a/bin/vim
+++ b/bin/vim
@@ -1,2 +1,11 @@
 #!/bin/sh
-exec /usr/local/bin/vim -p "$@"
+#####################################################################
+VIM_ARGS=(-p)
+VIM=/usr/bin/vim
+#####################################################################
+
+SOURCE_BUILD=/usr/local/bin/vim
+[ -f $SOURCE_BUILD ] && VIM=$SOURCE_BUILD
+
+#####################################################################
+exec $(printf "%q " $VIM ${VIM_ARGS[@]} $@)
diff --git a/config/tmux.conf b/config/tmux.conf
index df99452..46c366e 100644
--- a/config/tmux.conf
+++ b/config/tmux.conf
@@ -1,5 +1,10 @@
 # don't use escape key
 set -sg escape-time 0
+
+# don't use 'repeat" keys
+# (causes delay annoyances with '~/.wryn/scwrypts/ssh/omni/tmux.conf')
+set -sg repeat-time 0
+
 set-option -g default-shell /bin/zsh
 
 # quick reload
diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add
index ce65ff1..3150521 100644
--- a/vim/en.utf-8.add
+++ b/vim/en.utf-8.add
@@ -112,3 +112,4 @@ Kat
 submodule
 submodules
 CloudFlare
+Cloudflare
diff --git a/vim/en.utf-8.add.spl b/vim/en.utf-8.add.spl
index ccb9d4129ef9afb1a218745a1f1f46585f6a1378..acf79d6a912ce3cfa89675420f030a0059662307 100644
GIT binary patch
delta 406
zcmXX?F-yZ>6#VWb;2?Aq$D$&N&}v1Bh~iXGa8ewF#-z2FG$CJ8bQ5tA!J*&auMldT
z+!S=sT{1a4J2<#h?^828^6uT;yZ1egK8+T3H@0*Vgkj}dDd+sAAXpH7CrA;Yjt*Lg
z(FTErhzq4|wbRyJbO{C=6Uogw7Ll6{woAE3l-QM){Y>nz!ZMkXd4OXitn7!W1W;Ht
zpP0wcOpA}6xsd8e(TZ_ro~4Xs^CeT&%YaKU)@a5FqqMEMb|jvUkc&Ll*ebG^U6Yw(
zWR{Yf9jA=GIdfJR?B1DMD`uS905&rET2h-!^NxT6YX&8!nkErVTDE)fiH7!X#>~1!
ze3(tQv@~eagciM!x&WFN#s4gyT8nh}a1lAGmbi5uDtqSI9iJFRf4sq=6NGelNa0Cc
OQ=oqrs#o*wzWo5+Bwl3z

delta 379
zcmXX?u}T9$6ufzRkRlKe8=Ii0K~P8}qJn~8BZyduHdcvQWAH8)ZgT-E(`ciRVhg__
z1`#X;K_gh(+FMy#m_lb0o8|4yyqVd3Nk6AE2iv=*p@X3K>v`((E+bfkv=Jjj2~E@x
z0iM^d<5<M!bZ=DMw9rBwn!MxeCYI2*3HI{+GErhTMvfA3WRb^AOyvpA(BR4YAQlY|
zYxbLA13M=bbnLaPrm}7s5B5z8Sg}7co4V2r#kkF>$+0-1d6m^7B%|PcRY2EXsCC9a
zsfCSfLe|B&V(1!)UAkdgO(Ga}lXF9pkR~;X<h4RHa8u6C`&0O`JAQt-SEUIpIsx}I
z40}iastR`<(&Yby)OcGBzr^Rrp}qAdrU&6j*E>}@pu=N~vXl%L%rMY<x1avUAE-K5
AmjD0&

diff --git a/zsh/alias b/zsh/alias
index e0f446f..ee768e7 100644
--- a/zsh/alias
+++ b/zsh/alias
@@ -12,7 +12,30 @@ alias restart='clear; source ~/.zshrc'
 
 alias fix='vim $(git diff --name-only | uniq) -p'
 
-alias w='watch -tn1 '
+#####################################################################
+
+w() { # fancy(?) version of "alias w='watch -tcn1 '"
+	local WATCH_ARGS=()
+
+	WATCH_ARGS+=(--no-title)
+	WATCH_ARGS+=(--color)
+	WATCH_ARGS+=(--interval 1)
+
+	# don't add delay if command is available to /bin/sh
+	/bin/sh -c "command -v $1" >/dev/null 2>&1 && {
+		watch ${WATCH_ARGS[@]} $@
+		return $?
+	}
+
+	# quickly reduce first-order aliases
+	alias $1 >/dev/null 2>&1 && {
+		watch ${WATCH_ARGS[@]} $(which $1 | sed 's/.*aliased to //') ${@:2}
+		return $?
+	}
+
+	# import zshrc and inject current environment
+	watch ${WATCH_ARGS[@]} "zsh -c 'source ~/.zshrc >/dev/null 2>&1; $(while read e; do printf 'export '; printf '%q ' "$e"; echo; done < <(env) | grep '='); echo \"   $@\n---------------------------------------------------- \$(date +%H:%m:%S)\"; $@'"
+}
 
 #####################################################################