From afa865587e17c0c6af29451d41015599ec4d37aa Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Sat, 10 Feb 2018 19:21:25 +0100
Subject: [PATCH] zsh: move env variables setting before oh-my-zsh

Fixes #207.
---
 modules/programs/zsh.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 8005d69f9..d1371159f 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -301,6 +301,10 @@ in
           "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
         }
 
+        # Environment variables
+        . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+        ${envVarsStr}
+
         ${optionalString cfg.oh-my-zsh.enable ''
             # oh-my-zsh configuration generated by NixOS
             ${optionalString (cfg.oh-my-zsh.plugins != [])
@@ -331,10 +335,6 @@ in
 
         ${cfg.initExtra}
 
-        # Environment variables
-        . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
-        ${envVarsStr}
-
         # Aliases
         ${aliasesStr}
       '';