From 3bb4dbc5e0b9b9a003b3d47b7f48a98319ad9108 Mon Sep 17 00:00:00 2001
From: srdusr <trevorgray@srdusr.com>
Date: Tue, 30 Sep 2025 11:55:11 +0200
Subject: Various changes, fixed .zshenv initializing properly, updated
 install.sh/packages.yml (testing shell-git invocation/make tmp and re-exec
 with bash)

---
 common/config/zsh/.zshrc | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'common/config/zsh/.zshrc')

diff --git a/common/config/zsh/.zshrc b/common/config/zsh/.zshrc
index 0ada4f5..0d66b62 100644
--- a/common/config/zsh/.zshrc
+++ b/common/config/zsh/.zshrc
@@ -11,6 +11,10 @@
 # If not running interactively, and not being sourced, don’t do anything
 [[ $- != *i* ]] && [[ "${BASH_SOURCE[0]:-${(%):-%N}}" == "$0" ]] && return
 
+if [ -n "$ZSH_VERSION" ] && [ -f "$HOME/.config/zsh/.zshenv" ]; then
+    . "$HOME/.config/zsh/.zshenv"
+fi
+
 # Terminal key bindings
 #stty intr '^q' # Free Ctrl+C for copy use Ctrl+Q instead for Interrupt
 stty lnext '^-' # Free Ctrl+V for paste use Ctrl+- instead for Literal next
@@ -33,11 +37,6 @@ for zsh_source in "$HOME"/.config/zsh/user/*.zsh; do
     ZSH_SOURCES+=("$zsh_source")
 done
 
-# Source ZSH files
-for zsh_source in "${ZSH_SOURCES[@]}"; do
-    source "$zsh_source"
-done
-
 # Faster SSH
 if [[ -n "$SSH_CLIENT" ]]; then
     export KEYTIMEOUT=10
@@ -50,7 +49,13 @@ if [[ "${TERM_PROGRAM:-}" == "vscode" ]]; then
   unset ARGV0
 fi
 
+# Source ZSH files
+for zsh_source in "${ZSH_SOURCES[@]}"; do
+    source "$zsh_source"
+done
+
 ##########    Source Plugins, should be last    ##########
+#source /usr/share/nvm/init-nvm.sh
 
 # Load fzf keybindings and completion if fzf is installed
 if command -v fzf >/dev/null 2>&1; then
-- 
cgit v1.2.3