diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix
index bb138ef..38d74fe 100644
--- a/home/modules/zsh.nix
+++ b/home/modules/zsh.nix
@@ -4,8 +4,10 @@ let
   c = config.theme.colors;
 in
 {
+  # Tells HM to set ZDOTDIR, which moves all zsh config into ~/.config/zsh
   programs.zsh = {
     enable = true;
+    dotDir = ".config/zsh";        # sets ZDOTDIR automatically
 
     enableCompletion = true;
     autosuggestion.enable = true;
@@ -18,16 +20,29 @@ in
       share = true;
     };
 
-    # new
     initContent = ''
       PROMPT="%F{${c.green_b}}%n@%m%f %F{${c.yellow_b}}%~%f %F{${c.fg4}}»%f "
     '';
 
     shellAliases = {
-      ls  = "eza --icons";
-      ll  = "eza -la --icons";
-      cat = "bat";
+      ls   = "eza --icons";
+      ll   = "eza -la --icons";
+      cat  = "bat";
       grep = "rg";
     };
   };
+
+  # PATH additions — HM prepends these to PATH in the correct order
+  home.sessionPath = [
+  ];
+
+  # Environment variables
+  home.sessionVariables = {
+    EDITOR               = "emacsclient -c";
+    VISUAL               = "emacsclient -c";
+    SUDO_EDITOR          = "emacsclient -c";
+    PAGER                = "bat --color auto";
+    MANPAGER             = "bat -plman";
+    _JAVA_AWT_WM_NONREPARENTING = "1";
+  };
 }