From 60fbca9645f570276a7e2716e39a21e63216af53 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 20 Aug 2020 19:29:44 +0000
Subject: modules/xdg: set XDG variables with pam_env

This way, they also apply to systemd.
---
 modules/xdg/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix
index bf7783cd3986..bcdd19c4f48a 100644
--- a/modules/xdg/default.nix
+++ b/modules/xdg/default.nix
@@ -32,13 +32,10 @@ in
                   }) (filterAttrs (_: { xdg, ... }: xdg.config.paths != {})
                                   config.users.users));
 
-      environment.extraInit = ''
-        etc_xdg_config_home=/run/current-system/etc/xdg/nixos/per-user/$USER
-        if [ -d "$etc_xdg_config_home" ]; then
-            export XDG_CONFIG_HOME="''${XDG_CONFIG_HOME-$etc_xdg_config_home}"
-        fi
-        export XDG_DATA_HOME="''${XDG_DATA_HOME-$HOME/state}"
-        export XDG_CACHE_HOME="''${XDG_CACHE_HOME-$HOME/state/cache}"
-      '';
+      environment.sessionVariables = {
+        XDG_CONFIG_HOME = "/run/current-system/etc/xdg/nixos/per-user/$USER";
+        XDG_DATA_HOME = "$HOME/state";
+        XDG_CACHE_HOME = "$HOME/state/cache";
+      };
     };
   }
-- 
cgit 1.4.1