From adbbb0fd832c107357f62ff5b344413a121ef935 Mon Sep 17 00:00:00 2001
From: yage <yage@yage.io>
Date: Sat, 11 Nov 2023 07:16:04 -0700
Subject: [PATCH] config + scwryptsv3.7.2 update

---
 bin/vim              | 21 ++++++++++++++++-----
 config/git.conf      |  2 ++
 zsh/plugins/scwrypts |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bin/vim b/bin/vim
index e04e7dc..b8f739c 100755
--- a/bin/vim
+++ b/bin/vim
@@ -1,11 +1,22 @@
 #!/bin/sh
 #####################################################################
+
 VIM_ARGS=(-p)
-VIM=/usr/bin/vim
-#####################################################################
 
-SOURCE_BUILD=/usr/local/bin/vim
-[ -f $SOURCE_BUILD ] && VIM=$SOURCE_BUILD
+BUILD_PREFERENCE=(
+	/usr/local/bin/vim  # source build
+	/usr/bin/vim        # package manager build
+	)
+
+for V in ${BUILD_PREFERENCE[@]}
+do
+	[ -f $V ] && VIM=$V && break
+done
+
+[ -f $VIM ] || {
+	echo "unable to find a build for vim; is it installed?" >&2
+	exit 1
+}
 
 #####################################################################
-exec $(printf "%q " $VIM ${VIM_ARGS[@]} $@)
+exec $VIM ${VIM_ARGS[@]} "$@"
diff --git a/config/git.conf b/config/git.conf
index 358835f..7e0c404 100644
--- a/config/git.conf
+++ b/config/git.conf
@@ -13,6 +13,8 @@
 [pull]
 	default = current
 	rebase = true
+[rebase]
+	autostash = true
 [color]
 	diff = always
 	status = always
diff --git a/zsh/plugins/scwrypts b/zsh/plugins/scwrypts
index 2034325..15942bb 160000
--- a/zsh/plugins/scwrypts
+++ b/zsh/plugins/scwrypts
@@ -1 +1 @@
-Subproject commit 2034325ac9153b6b338947443a21cdfefb8b9cb2
+Subproject commit 15942bb08d5c3f413941faae0eff7f1d49a00e49