From 432ba3144e3218873f87a40460bee6b6639f657d Mon Sep 17 00:00:00 2001
From: Josh Sherman <joshsherman@gmail.com>
Date: Sun, 27 Feb 2022 13:44:15 -0600
Subject: [PATCH] Drop zsh plugins from installer

Same deal as fzf, moving away from installing these things as part of
the installer and favoring a version installed by the operating system's
package manager
---
 install    | 11 -----------
 zsh/.zshrc | 15 +++++----------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/install b/install
index c8454cf..01060f6 100755
--- a/install
+++ b/install
@@ -31,17 +31,6 @@ mkdir -p "$DOTLOCAL"
 
 stow git screen vim zsh
 
-ZSHPLUGS=(
-  "zsh-completions"
-  "zsh-history-substring-search"
-  "zsh-syntax-highlighting"
-)
-
-for INDEX in ${!ZSHPLUGS[*]}; do
-  ZSHPLUG="${ZSHPLUGS[$INDEX]}"
-  $GITCLONE "https://github.com/zsh-users/$ZSHPLUG.git" "$DOTLOCAL/$ZSHPLUG"
-done
-
 VIMPLUGS=(
   # File exploration and navigation
   "junegunn/fzf.vim"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8ce8dd4..9174eda 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,8 +1,5 @@
 #!/usr/bin/env zsh
 
-export DOTFILES=$HOME/.dotfiles
-export INCLUDES=$HOME/.local/share/dotfiles
-
 # Speed up `brew install`
 export HOMEBREW_NO_AUTO_UPDATE=1
 
@@ -11,9 +8,11 @@ source $HOME/.aliases
 
 eval `dircolors $HOME/.dircolors`
 
-source $INCLUDES/zsh-completions/zsh-completions.plugin.zsh
-source $INCLUDES/zsh-history-substring-search/zsh-history-substring-search.zsh
-source $INCLUDES/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# TODO: May need to tweak this for macOS/brew installed stuff
+source /usr/share/fzf/completion.zsh
+source /usr/share/fzf/key-bindings.zsh
+source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 HISTFILE=$HOME/.zsh_history
 HISTSIZE=1000000
@@ -66,10 +65,6 @@ PS1='
 %F{blue}%~$(git_prompt)
 %F{244}%# %F{reset}'
 
-# TODO: May need to tweak this for macOS/brew installed fzf
-source /usr/share/fzf/key-bindings.zsh
-source /usr/share/fzf/completion.zsh
-
 # Only autoload nvm on a specific machine, default to lazy loading
 # TODO: Maybe drop the lazy loading entirely as I never use nvm outside of work?
 if [[ $(hostname) == "x1carbon.josh" ]]; then