diff --git a/nix/home/opdavies/default.nix b/nix/home/opdavies/default.nix
index 537421c6..83613283 100644
--- a/nix/home/opdavies/default.nix
+++ b/nix/home/opdavies/default.nix
@@ -80,16 +80,19 @@ in
     PULUMI_SKIP_UPDATE_CHECK = "true";
     W3M_DIR = "${stateHome}/w3m";
     WGETRC = "${configHome}/wgetrc";
-    XDG_CONFIG_HOME = configHome;
-    XDG_DATA_HOME = dataHome;
-    XDG_DOCUMENTS_DIR = "$HOME/Documents";
-    XDG_REPOS_DIR = "$HOME/Code";
-    XDG_STATE_HOME = config.xdg.stateHome;
   };
 
-  xdg.configFile = {
-    "${config.home.sessionVariables.WGETRC}".text = ''
-      hsts-file = "${cacheHome}/wget-hsts"
-    '';
+  xdg = {
+    configFile = {
+      "${config.home.sessionVariables.WGETRC}".text = ''
+        hsts-file = "${cacheHome}/wget-hsts"
+      '';
+    };
+
+    userDirs = {
+      extraConfig = {
+        XDG_REPOS_DIR = "${config.home.homeDirectory}/Code";
+      };
+    };
   };
 }
diff --git a/nix/modules/home-manager/cli/git.nix b/nix/modules/home-manager/cli/git.nix
index 237ed745..d0d64c77 100644
--- a/nix/modules/home-manager/cli/git.nix
+++ b/nix/modules/home-manager/cli/git.nix
@@ -29,7 +29,7 @@
 
       includes = [
         {
-          condition = "gitdir:${config.home.sessionVariables.XDG_REPOS_DIR}/tfw";
+          condition = "gitdir:${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/tfw";
           contents.user.email = "oliver.davies@tfw.wales";
         }
       ];
diff --git a/nix/modules/home-manager/cli/zsh/aliases.nix b/nix/modules/home-manager/cli/zsh/aliases.nix
index 0b362271..a31448f2 100644
--- a/nix/modules/home-manager/cli/zsh/aliases.nix
+++ b/nix/modules/home-manager/cli/zsh/aliases.nix
@@ -10,6 +10,6 @@
   s = "secrets";
   secrets = ''doppler --project "$(whoami)" run'';
   tag = "tag-release";
-  vss = "LC_ALL=C sort --unique ${config.home.sessionVariables.XDG_REPOS_DIR}/dotfiles/nvim/spell/en.utf-8.add --output ${config.home.sessionVariables.XDG_REPOS_DIR}/dotfiles/nvim/spell/en.utf-8.add";
+  vss = "LC_ALL=C sort --unique ${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/dotfiles/nvim/spell/en.utf-8.add --output ${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/dotfiles/nvim/spell/en.utf-8.add";
   wt = "git worktree";
 }