From 09872874611c94e606ec402316165530c41c7209 Mon Sep 17 00:00:00 2001
From: Timmy Keller <tjk@tjkeller.xyz>
Date: Sat, 4 Sep 2021 18:38:25 -0500
Subject: changed system for loading zsh plugins

---
 zsh/zprofile.G3N2        |  4 ++++
 zsh/zprofile.openbsdx230 |  4 ++++
 zsh/zprofile.voidx250    |  4 ++++
 zsh/zshrc                | 11 ++++-------
 4 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'zsh')

diff --git a/zsh/zprofile.G3N2 b/zsh/zprofile.G3N2
index eedd9d0..c62022d 100644
--- a/zsh/zprofile.G3N2
+++ b/zsh/zprofile.G3N2
@@ -3,6 +3,10 @@
 export WIFIDEV="wlp2s0f0u3"
 export ETHEDEV="eno1"
 export PATH="/home/timmy/scripts/pkgmgt/emerge:$PATH"
+export ZPLUGINS=(
+/usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh
+/usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
+)
 alias \
 	e="sudo emerge" \
 	eaum="sudo emerge --autounmask-continue" \
diff --git a/zsh/zprofile.openbsdx230 b/zsh/zprofile.openbsdx230
index c3a6a95..9a27234 100644
--- a/zsh/zprofile.openbsdx230
+++ b/zsh/zprofile.openbsdx230
@@ -3,4 +3,8 @@
 #export PATH="/home/timmy/scripts/pkgmgt/xbps:$PATH"
 export WIFIDEV="iwn0"
 export ETHEDEV="em0"
+#/usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh
+export ZPLUGINS=(
+/usr/local/share/zsh-syntax-highlighting/zsh-syntax/highlighting.zsh
+)
 source /home/timmy/.config/zsh/zprofile.base
diff --git a/zsh/zprofile.voidx250 b/zsh/zprofile.voidx250
index 19ff378..49feb89 100644
--- a/zsh/zprofile.voidx250
+++ b/zsh/zprofile.voidx250
@@ -3,6 +3,10 @@
 export WIFIDEV="wlp3s0"
 export ETHEDEV="enp0s25"
 export PATH="/home/timmy/scripts/pkgmgt/xbps:$PATH"
+export ZPLUGINS=(
+/usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh
+/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+)
 alias \
 	xi="sudo xbps-install" \
 	xq="xbps-query -R --search" \
diff --git a/zsh/zshrc b/zsh/zshrc
index b320821..ec04280 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -19,8 +19,7 @@ setopt SHARE_HISTORY		# Share history between zsh sessions
 setopt HIST_REDUCE_BLANKS
 setopt HIST_IGNORE_DUPS		# Successive duplicate entries ignored
 setopt HIST_IGNORE_SPACE	# Entries with leading space ignored
-# This seems to reduce overall disk writes
-#unsetopt EXTENDED_HISTORY	# Save only the command, not any superfluous info
+setopt EXTENDED_HISTORY		# Save superfluous info with command to reduce disk writes
 
 # Change cursor shape for different vi modes (Cred: LARBS)
 function zle-keymap-select () {
@@ -39,8 +38,6 @@ echo -n '\e[5 q' # Use beam shape cursor on startup
 preexec() { echo -n '\e[5 q' ;} # Use beam shape cursor for each new prompt
 
 # Load zsh plugins; should be last
-#source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-source /usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh 2>/dev/null
-[ "$COMPUTER" = "desktop" ] && source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh 2>/dev/null || \
-[ "$COMPUTER" = "laptop" ] && source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
-#source /home/timmy/.config/broot/launcher/bash/br
+for plugin in $ZPLUGINS; do
+	source $plugin
+done
-- 
cgit v1.2.3