From 11ef3873cd47ce0781a41af2f23c5f6c1e9880d9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 28 Jan 2017 18:29:27 +0100
Subject: [PATCH] xsession: always source `~/.profile`

It seems to be pretty standard to do this so always do it, not just when
Bash is the session variable setter.
---
 modules/xsession.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/xsession.nix b/modules/xsession.nix
index f498d5178..f18d7e8b7 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -72,12 +72,9 @@ in
     home.file.".xsession" = {
       mode = "555";
       text = ''
-        ${
-          # If we want bash to set the session variables then we need
-          # to pull in .profile since that's where they are.
-          optionalString (config.home.sessionVariableSetter == "bash")
-            ". \"$HOME/.profile\""
-        }
+        if [[ -e "$HOME/.profile" ]]; then
+          . "$HOME/.profile"
+        fi
 
         systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS
         systemctl --user import-environment DISPLAY