From f27988541113da203ec30121b4e046f1b2b7e320 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 12 Dec 2020 21:47:33 +0100
Subject: Don't assume usages of XDG_ will be expanded

---
 user/settings/base.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'user/settings/base.nix')

diff --git a/user/settings/base.nix b/user/settings/base.nix
index b181d4ad..eda280fa 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -42,11 +42,16 @@
       };
     };
   };
-    EMAIL = "alan@alanpearce.eu";
-    XDG_CACHE_HOME = if pkgs.stdenv.isDarwin then "$HOME/Library/Caches/XDG" else "$HOME/.cache";
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_DATA_HOME = "$HOME/.local/share";
-  };
+  home.sessionVariables =
+    let
+      HOME = builtins.getEnv "HOME";
+    in
+    {
+      EMAIL = "alan@alanpearce.eu";
+      XDG_CACHE_HOME = if pkgs.stdenv.isDarwin then "${HOME}/Library/Caches/XDG" else "${HOME}/.cache";
+      XDG_CONFIG_HOME = "${HOME}/.config";
+      XDG_DATA_HOME = "${HOME}/.local/share";
+    };
 
   programs.zsh.shellAliases = {
     make = "remake";
-- 
cgit 1.4.1