Regenerated

Droidnix/README.org

@@ -1145,7 +1145,7 @@ This sets up the zsh in the terminal
 { lib, pkgs, flakeRoot, ... }:
 
 let
-  # Path to generated global zshrc
+  # Path to generated zshrc (optional per-user tweaks)
   generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
 in
 {
@@ -1157,6 +1157,13 @@ in
     oh-my-zsh
   ];
 
+  #################################
+  # Set Zsh to use ~/.config/zsh as its config directory
+  #################################
+  environment.etc."zshenv".text = ''
+    export ZDOTDIR=$HOME/.config/zsh
+  '';
+
   #################################
   # Deploy global zshrc for all users
   #################################
@@ -1165,6 +1172,9 @@ in
     ZSH_THEME=""
     plugins=(git sudo extract colored-man-pages command-not-found history docker kubectl)
     source $ZSH/oh-my-zsh.sh
+
+    # Load optional per-user generated zshrc if it exists
+    [ -f "${generatedZsh}" ] && source "${generatedZsh}"
   '';
 }
 #+END_SRC

Droidnix/generated/modules/traveldroid/apps/zsh.nix

@@ -1,7 +1,7 @@
 { lib, pkgs, flakeRoot, ... }:
 
 let
-  # Path to generated global zshrc
+  # Path to generated zshrc (optional per-user tweaks)
   generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
 in
 {
@@ -13,6 +13,13 @@ in
     oh-my-zsh
   ];
 
+  #################################
+  # Set Zsh to use ~/.config/zsh as its config directory
+  #################################
+  environment.etc."zshenv".text = ''
+    export ZDOTDIR=$HOME/.config/zsh
+  '';
+
   #################################
   # Deploy global zshrc for all users
   #################################
@@ -21,5 +28,8 @@ in
     ZSH_THEME=""
     plugins=(git sudo extract colored-man-pages command-not-found history docker kubectl)
     source $ZSH/oh-my-zsh.sh
+
+    # Load optional per-user generated zshrc if it exists
+    [ -f "${generatedZsh}" ] && source "${generatedZsh}"
   '';
 }