From bfa7ee9f67ed1ff8443e578c5ef37952280059b2 Mon Sep 17 00:00:00 2001
From: Kyler Clay <kylerclay@proton.me>
Date: Thu, 10 Oct 2024 05:16:34 -0400
Subject: [PATCH] Commit for generation 237

---
 glasshouse-desktop/home/zsh/zkbd       | 77 +++++++++++++++-----------
 glasshouse-desktop/home/zsh/zshell.nix |  5 +-
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/glasshouse-desktop/home/zsh/zkbd b/glasshouse-desktop/home/zsh/zkbd
index 795ddea..e752ee8 100644
--- a/glasshouse-desktop/home/zsh/zkbd
+++ b/glasshouse-desktop/home/zsh/zkbd
@@ -1,39 +1,52 @@
 
-function left-beep {
-	[[ $CURSOR -eq 0 ]] && return
-	zle vi-backward-char
-	(aplay /home/pagedmov/sound/sys/move_h.wav > /dev/null 2>&1 &)
-}
-function right-beep {
-	zle autosuggest-accept
-	[[ $CURSOR -eq ${#BUFFER} ]] && return
-	zle vi-forward-char
-	(aplay /home/pagedmov/sound/sys/move_h.wav > /dev/null 2>&1 &)
-}
-function up-beep {
-	zle up-line-or-history
-	(aplay /home/pagedmov/sound/sys/move_v.wav > /dev/null 2>&1 &)
-}
-function down-beep {
-	zle down-line-or-history
-	(aplay /home/pagedmov/sound/sys/move_v.wav > /dev/null 2>&1 &)
-}
-zle -N left-beep 
-zle -N right-beep
-zle -N up-beep
-zle -N down-beep
+#function left-beep {
+#	[[ $CURSOR -eq 0 ]] && return
+#	zle vi-backward-char
+#	(aplay /home/pagedmov/sound/sys/move_h.wav > /dev/null 2>&1 &)
+#}
+#function right-beep {
+#	zle autosuggest-accept
+#	[[ $CURSOR -eq ${#BUFFER} ]] && return
+#	zle vi-forward-char
+#	(aplay /home/pagedmov/sound/sys/move_h.wav > /dev/null 2>&1 &)
+#}
+#function up-beep {
+#	zle up-line-or-history
+#	(aplay /home/pagedmov/sound/sys/move_v.wav > /dev/null 2>&1 &)
+#}
+#function down-beep {
+#	zle down-line-or-history
+#	(aplay /home/pagedmov/sound/sys/move_v.wav > /dev/null 2>&1 &)
+#}
+#zle -N left-beep 
+#zle -N right-beep
+#zle -N up-beep
+#zle -N down-beep
 
 bindkey -v
 
-bindkey -M viins "^[OD" left-beep
-bindkey -M viins "^[OC" right-beep
-bindkey -M viins "^[OB" down-beep
-bindkey -M viins "^[OA" up-beep
+#bindkey -M viins "^[OD" left-beep
+#bindkey -M viins "^[OC" right-beep
+#bindkey -M viins "^[OB" down-beep
+#bindkey -M viins "^[OA" up-beep
 
-bindkey -M vicmd "h" left-beep
-bindkey -M vicmd "l" right-beep
-bindkey -M vicmd "j" down-beep
-bindkey -M vicmd "k" up-beep
+#bindkey -M vicmd "h" left-beep
+#bindkey -M vicmd "l" right-beep
+#bindkey -M vicmd "j" down-beep
+#bindkey -M vicmd "k" up-beep
+#ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=("right-beep")
 
-ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=("right-beep")
+function zle-keymap-select {
+  if [[ ${KEYMAP} == vicmd ]] ||
+     [[ $1 = 'block' ]]; then
+    echo -ne "\e[1 q"  # Change the cursor to a block (normal mode)
+  else
+    echo -ne "\e[5 q"  # Change the cursor to a line (insert mode)
+  fi
+}
+zle -N zle-keymap-select
+zle-line-init() {
+  zle-keymap-select 'insert'
+}
+zle -N zle-line-init
 
diff --git a/glasshouse-desktop/home/zsh/zshell.nix b/glasshouse-desktop/home/zsh/zshell.nix
index 019be96..b1b782e 100644
--- a/glasshouse-desktop/home/zsh/zshell.nix
+++ b/glasshouse-desktop/home/zsh/zshell.nix
@@ -309,10 +309,7 @@ fi
 clear
 source ~/sysflakes/glasshouse-desktop/home/zsh/zkbd
 ~/coding/scripts/splash.sh
-type starship_zle-keymap-select >/dev/null || \
-  {
-    eval "$(/usr/local/bin/starship init zsh)"
-  }
+eval "$(starship init zsh)"
 s_check && (aplay ~/sound/sys/sh-source.wav > /dev/null 2>&1 &)
 		'';