about summary refs log tree commit diff
path: root/modules/xdg
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-08-20 19:29:44 +0000
committerAlyssa Ross <hi@alyssa.is>2020-08-22 17:12:33 +0000
commit60fbca9645f570276a7e2716e39a21e63216af53 (patch)
tree666a7d44029c73b933bbaec94b6e7f09892f9d20 /modules/xdg
parent549d0c9103861e72c0f091a3d69b11f22e5842ed (diff)
downloadnixlib-60fbca9645f570276a7e2716e39a21e63216af53.tar
nixlib-60fbca9645f570276a7e2716e39a21e63216af53.tar.gz
nixlib-60fbca9645f570276a7e2716e39a21e63216af53.tar.bz2
nixlib-60fbca9645f570276a7e2716e39a21e63216af53.tar.lz
nixlib-60fbca9645f570276a7e2716e39a21e63216af53.tar.xz
nixlib-60fbca9645f570276a7e2716e39a21e63216af53.tar.zst
nixlib-60fbca9645f570276a7e2716e39a21e63216af53.zip
modules/xdg: set XDG variables with pam_env
This way, they also apply to systemd.
Diffstat (limited to 'modules/xdg')
-rw-r--r--modules/xdg/default.nix13
1 files changed, 5 insertions, 8 deletions
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";
+      };
     };
   }