From 17fe830d38ea039209712504e95a6826b73940f8 Mon Sep 17 00:00:00 2001
From: Toby Vincent <tobyv13@gmail.com>
Date: Sat, 6 May 2023 14:27:59 -0500
Subject: fix(tmux,zsh): fix load order for clipboard hooks

---
 wsl/.config/zsh/.zshrc.d/60-wsl.zsh | 59 -------------------------------------
 wsl/.config/zsh/.zshrc.d/99-wsl.zsh | 59 +++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 wsl/.config/zsh/.zshrc.d/60-wsl.zsh
 create mode 100644 wsl/.config/zsh/.zshrc.d/99-wsl.zsh

(limited to 'wsl')

diff --git a/wsl/.config/zsh/.zshrc.d/60-wsl.zsh b/wsl/.config/zsh/.zshrc.d/60-wsl.zsh
deleted file mode 100644
index 22cd17d..0000000
--- a/wsl/.config/zsh/.zshrc.d/60-wsl.zsh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-alias wsl='/mnt/c/Windows/system32/wsl.exe'
-alias powershell='/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe'
-alias pwsh='/mnt/c/Program Files/PowerShell/7/pwsh.exe'
-alias winget='/mnt/c/Users/tobyv/AppData/Local/Microsoft/WindowsApps/winget.exe'
-alias scoop='/mnt/c/Users/tobyv/scoop/shims/scoop'
-
-zvm_vi_yank () {
-	zvm_yank
-	printf %s "${CUTBUFFER}" | win32yank.exe -i
-	zvm_exit_visual_mode
-}
-
-zvm_vi_put_after () {
-	local head= foot=
-  local content=$(win32yank.exe -o)
-	local offset=1
-	if [[ ${content: -1} == $'\n' ]]
-	then
-		local pos=${CURSOR}
-		for ((; $pos<$#BUFFER; pos++)) do
-			if [[ ${BUFFER:$pos:1} == $'\n' ]]
-			then
-				pos=$pos+1
-				break
-			fi
-		done
-		if zvm_is_empty_line
-		then
-			head=${BUFFER:0:$pos}
-			foot=${BUFFER:$pos}
-		else
-			head=${BUFFER:0:$pos}
-			foot=${BUFFER:$pos}
-			if [[ $pos == $#BUFFER ]]
-			then
-				content=$'\n'${content:0:-1}
-				pos=$pos+1
-			fi
-		fi
-		offset=0
-		BUFFER="${head}${content}${foot}"
-		CURSOR=$pos
-	else
-		if zvm_is_empty_line
-		then
-			head="${BUFFER:0:$((CURSOR-1))}"
-			foot="${BUFFER:$CURSOR}"
-		else
-			head="${BUFFER:0:$CURSOR}"
-			foot="${BUFFER:$((CURSOR+1))}"
-		fi
-		BUFFER="${head}${BUFFER:$CURSOR:1}${content}${foot}"
-		CURSOR=$CURSOR+$#content
-	fi
-	zvm_highlight clear
-	zvm_highlight custom $(($#head+$offset)) $(($#head+$#content+$offset))
-}
diff --git a/wsl/.config/zsh/.zshrc.d/99-wsl.zsh b/wsl/.config/zsh/.zshrc.d/99-wsl.zsh
new file mode 100644
index 0000000..22cd17d
--- /dev/null
+++ b/wsl/.config/zsh/.zshrc.d/99-wsl.zsh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+alias wsl='/mnt/c/Windows/system32/wsl.exe'
+alias powershell='/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe'
+alias pwsh='/mnt/c/Program Files/PowerShell/7/pwsh.exe'
+alias winget='/mnt/c/Users/tobyv/AppData/Local/Microsoft/WindowsApps/winget.exe'
+alias scoop='/mnt/c/Users/tobyv/scoop/shims/scoop'
+
+zvm_vi_yank () {
+	zvm_yank
+	printf %s "${CUTBUFFER}" | win32yank.exe -i
+	zvm_exit_visual_mode
+}
+
+zvm_vi_put_after () {
+	local head= foot=
+  local content=$(win32yank.exe -o)
+	local offset=1
+	if [[ ${content: -1} == $'\n' ]]
+	then
+		local pos=${CURSOR}
+		for ((; $pos<$#BUFFER; pos++)) do
+			if [[ ${BUFFER:$pos:1} == $'\n' ]]
+			then
+				pos=$pos+1
+				break
+			fi
+		done
+		if zvm_is_empty_line
+		then
+			head=${BUFFER:0:$pos}
+			foot=${BUFFER:$pos}
+		else
+			head=${BUFFER:0:$pos}
+			foot=${BUFFER:$pos}
+			if [[ $pos == $#BUFFER ]]
+			then
+				content=$'\n'${content:0:-1}
+				pos=$pos+1
+			fi
+		fi
+		offset=0
+		BUFFER="${head}${content}${foot}"
+		CURSOR=$pos
+	else
+		if zvm_is_empty_line
+		then
+			head="${BUFFER:0:$((CURSOR-1))}"
+			foot="${BUFFER:$CURSOR}"
+		else
+			head="${BUFFER:0:$CURSOR}"
+			foot="${BUFFER:$((CURSOR+1))}"
+		fi
+		BUFFER="${head}${BUFFER:$CURSOR:1}${content}${foot}"
+		CURSOR=$CURSOR+$#content
+	fi
+	zvm_highlight clear
+	zvm_highlight custom $(($#head+$offset)) $(($#head+$#content+$offset))
+}
-- 
cgit v1.2.3-70-g09d2