From 91127fde5b506a833b0d14e7f59e032f2ed2e259 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Mar 2025 12:49:31 -0400
Subject: [PATCH] improve zsh plugin loading

---
 dot_config/zsh/dot_zshrc | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc
index 5b714e3..af4bb6c 100644
--- a/dot_config/zsh/dot_zshrc
+++ b/dot_config/zsh/dot_zshrc
@@ -102,15 +102,38 @@ if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-no
 fi
 
 ### hooks/includes
-for plugin in zsh-syntax-highlighting zsh-history-substring-search \
-  zsh-autosuggestions; do
-	if [ -f /usr/share/zsh/plugins/$plugin/${plugin}.zsh ]; then
-		source /usr/share/zsh/plugins/$plugin/${plugin}.zsh
-	fi
+for plugin in zsh-syntax-highlighting zsh-history-substring-search zsh-autosuggestions; do
+    # Define possible locations for this plugin
+    possible_locations=(
+        # Standard location
+        "/usr/share/zsh/plugins/$plugin/$plugin.zsh"
+        # Direct in /usr/share
+        "/usr/share/$plugin/$plugin.zsh"
+        # Home directory locations
+        "$HOME/.local/share/$plugin/$plugin.zsh"
+        # Version-specific directory (for history-substring-search)
+        "$HOME/.local/share/$plugin/$plugin-*/($plugin).zsh"
+        # Oh-My-Zsh style plugin location
+        "$HOME/.oh-my-zsh/custom/plugins/$plugin/$plugin.zsh"
+        # Homebrew location (for macOS users)
+        "/usr/local/share/$plugin/$plugin.zsh"
+        # Specific path for history-substring-search with version number
+        "$HOME/.local/share/zsh-history-substring-search/zsh-history-substring-search-*/zsh-history-substring-search.zsh"
+    )
+    # Try each location until we find one that exists
+    for location in "${possible_locations[@]}"; do
+        # Expand the path in case it contains wildcards
+        expanded_locations=( ${~location} )
+        # Check each expanded location
+        for expanded_location in "${expanded_locations[@]}"; do
+            if [[ -f "$expanded_location" ]]; then
+                source "$expanded_location"
+                # Break out of the inner loop
+                break 2
+            fi
+        done
+    done
 done
-source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-source "$HOME/.local/share/zsh-history-substring-search/zsh-history-substring-search-1.1.0/zsh-history-substring-search.zsh"
-source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down