From c8ce1402afb8b2a845ec4979856870b6079f9ebc Mon Sep 17 00:00:00 2001
From: yage <yage@yage.io>
Date: Sat, 11 Nov 2023 15:15:14 -0700
Subject: [PATCH] vundle install on setup fixes + fzf-tab and scwrypts versions

---
 config/scwrypts/vundle.zsh | 21 +++++------------
 setup/config.zsh           |  5 +---
 vim/update                 | 47 --------------------------------------
 zsh/plugins/fzf-tab        |  2 +-
 zsh/plugins/scwrypts       |  2 +-
 5 files changed, 9 insertions(+), 68 deletions(-)
 delete mode 100755 vim/update

diff --git a/config/scwrypts/vundle.zsh b/config/scwrypts/vundle.zsh
index 60a4fe6..3f45591 100644
--- a/config/scwrypts/vundle.zsh
+++ b/config/scwrypts/vundle.zsh
@@ -2,17 +2,6 @@
 # Scwrypts Build Definitions
 #
 
-VUNDLE_BUILD__ale() {}
-VUNDLE_BUILD__nerdtree() {}
-VUNDLE_BUILD__vim-dim() {}
-VUNDLE_BUILD__vim-fugitive() {}
-VUNDLE_BUILD__vim-go() {}
-VUNDLE_BUILD__vim-surround() {}
-
-VUNDLE_BUILD__vim-hexokinase() { make hexokinase; }
-
-VUNDLE_BUILD__youcompleteme()  { ./install.py --all; }
-
 VUNDLE__BUILD__ale() {
 	# ... build steps from /home/w0ryn/.vim/ale 
 }
@@ -33,14 +22,16 @@ VUNDLE__BUILD__vim-go() {
 	# ... build steps from /home/w0ryn/.vim/vim-go 
 }
 
-VUNDLE__BUILD__vim-hexokinase() {
-	# ... build steps from /home/w0ryn/.vim/vim-hexokinase 
-}
-
 VUNDLE__BUILD__vim-surround() {
 	# ... build steps from /home/w0ryn/.vim/vim-surround 
 }
 
+VUNDLE__BUILD__vim-hexokinase() {
+	# ... build steps from /home/w0ryn/.vim/vim-hexokinase 
+	make hexokinase
+}
+
 VUNDLE__BUILD__youcompleteme() {
 	# ... build steps from /home/w0ryn/.vim/youcompleteme 
+	./install.py --all
 }
diff --git a/setup/config.zsh b/setup/config.zsh
index db42a73..f475523 100644
--- a/setup/config.zsh
+++ b/setup/config.zsh
@@ -39,10 +39,7 @@ CONFIG__VIM() {
 	[ $COMPILE_VIM ] && [[ $COMPILE_VIM -eq 1 ]] && return 0
 
 	STATUS 'starting vim setup'
-	"$DOTWRYN_PATH/vim/update" \
-		&& SUCCESS 'completed vim setup' \
-		|| FAIL 1 'error detected in vim setup (see above)' \
-		;
+	SCWRYPTS --name ystem/vim/vundle/install --group scwrypts --type zsh || return 1
 }
 
 #####################################################################
diff --git a/vim/update b/vim/update
deleted file mode 100755
index 4732dd3..0000000
--- a/vim/update
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/zsh
-source "$HOME/.config/wryn/env.zsh"
-#####################################################################
-
-UPDATE() {
-	local VIM_PATH="$HOME/.local/share/source-packages/vim"
-
-	VIM_INSTALL --only-pull || return 1
-
-	cd "$VIM_PATH"
-	__STATUS 'configuring vim'
-	./configure \
-			--with-features=huge \
-			--enable-cscope \
-			--enable-gtk2-check \
-			--enable-gtk3-check \
-			--with-x \
-			--enable-gui=auto \
-			--enable-luainterp=yes \
-			--enable-perlinterp=yes \
-			--enable-python3interp=yes \
-			--enable-rubyinterp=yes \
-			--enable-terminal \
-		&& __SUCCESS 'finished configuring vim' \
-		|| __FAIL 3 'failed to configure vim (see above)' \
-		;
-
-	VIM_INSTALL $@ --only-build || __FAIL 2 'vim build failed (try with --clean for make clean)'
-
-	VUNDLE_INSTALL || __FAIL 3 'vundle plugin install failed'
-}
-
-VIM_INSTALL() {
-	scwrypts -n packages/install -- \
-		--target-url 'https://github.com/vim/vim.git' \
-		--local-name 'vim' \
-		--update \
-		$@
-}
-
-VUNDLE_INSTALL() {
-	"$DOTWRYN/bin/scwrypts" --env local --no-log \
-		zsh/vim/vundle/install $@
-}
-
-#####################################################################
-UPDATE $@
diff --git a/zsh/plugins/fzf-tab b/zsh/plugins/fzf-tab
index 938eef7..c2b4aa5 160000
--- a/zsh/plugins/fzf-tab
+++ b/zsh/plugins/fzf-tab
@@ -1 +1 @@
-Subproject commit 938eef72e93ddb0609205a663bf0783f4e1b5fae
+Subproject commit c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9
diff --git a/zsh/plugins/scwrypts b/zsh/plugins/scwrypts
index 15942bb..e6dfff2 160000
--- a/zsh/plugins/scwrypts
+++ b/zsh/plugins/scwrypts
@@ -1 +1 @@
-Subproject commit 15942bb08d5c3f413941faae0eff7f1d49a00e49
+Subproject commit e6dfff255ce57a53e5e6f33887819b7eda62eec0