From 1899081f06acfbf8b256531ec8cf2a3b860d515f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Tue, 18 Mar 2025 17:43:56 +0000
Subject: [PATCH] Refactor XDG session variables

---
 nix/home/opdavies/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nix/home/opdavies/default.nix b/nix/home/opdavies/default.nix
index ed478bee..08881369 100644
--- a/nix/home/opdavies/default.nix
+++ b/nix/home/opdavies/default.nix
@@ -21,7 +21,13 @@ let
     ];
   };
 
-  inherit (config.xdg) cacheHome configHome;
+  inherit (config.xdg)
+    cacheHome
+    configHome
+    dataHome
+    stateHome
+    ;
+
   inherit (pkgs) lib;
 
   shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
@@ -63,7 +69,7 @@ in
     LANG = "en_GB.UTF-8";
     LC_ALL = "en_GB.UTF-8";
     LC_CTYPE = "en_GB.UTF-8";
-    PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass";
+    PASSWORD_STORE_DIR = "${dataHome}/pass";
     PATH = lib.concatStringsSep ":" [
       "$PATH"
       "$HOME/go/bin"
@@ -71,10 +77,10 @@ in
       "./node_modules/.bin"
     ];
     PULUMI_SKIP_UPDATE_CHECK = "true";
-    W3M_DIR = "${config.xdg.stateHome}/w3m";
+    W3M_DIR = "${stateHome}/w3m";
     WGETRC = "${configHome}/wgetrc";
-    XDG_CONFIG_HOME = "${config.xdg.configHome}";
-    XDG_DATA_HOME = "${config.xdg.dataHome}";
+    XDG_CONFIG_HOME = configHome;
+    XDG_DATA_HOME = dataHome;
     XDG_DOCUMENTS_DIR = "$HOME/Documents";
     XDG_REPOS_DIR = "$HOME/Code";
     XDG_STATE_HOME = config.xdg.stateHome;