From 0b49d57487740f6db2738d52c77d46d738637301 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 30 Nov 2019 22:05:33 +0100
Subject: [PATCH] Check hm-session-vars only if home-manager is enabled

---
 modules/environment/login/login-inner.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
index 82996af..1bb568b 100644
--- a/modules/environment/login/login-inner.nix
+++ b/modules/environment/login/login-inner.nix
@@ -61,11 +61,13 @@ writeText "login-inner" ''
   [ "$#" -gt 0 ] || echo "Sourcing Nix environment..."
   . $HOME/.nix-profile/etc/profile.d/nix.sh
 
-  if [ -e "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then
-    [ "$#" -gt 0 ] || echo "Sourcing home-manager environment..."
-    export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
-    . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
-  fi
+  ${lib.optionalString (config.home-manager.config != null) ''
+    if [ -e "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then
+      [ "$#" -gt 0 ] || echo "Sourcing home-manager environment..."
+      export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
+      . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+    fi
+  ''}
 
   # Workaround for https://github.com/NixOS/nix/issues/1865
   export NIX_PATH=nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs/:$NIX_PATH