diff --git a/home-manager/base/default.nix b/home-manager/base/default.nix
index d27757b..5008a35 100644
--- a/home-manager/base/default.nix
+++ b/home-manager/base/default.nix
@@ -20,6 +20,13 @@ in
 
   kekleo = lib.mkIf (osConfig != null) (mkDefaultSharedAttrs config.kekleo (osConfig.kekleo or { }));
 
+  home.sessionVariables = {
+    XDG_CACHE_HOME = "$HOME/.cache";
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_DATA_HOME = "$HOME/.local/share";
+    XDG_STATE_HOME = "$HOME/.local/state";
+  };
+
   programs.home-manager.enable = true;
 
   # Nicely reload system units when changing configs
diff --git a/nixos/base/default.nix b/nixos/base/default.nix
index 5dcbd93..195f66b 100644
--- a/nixos/base/default.nix
+++ b/nixos/base/default.nix
@@ -30,13 +30,6 @@
       nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
     };
 
-  environment.sessionVariables = {
-    XDG_CACHE_HOME = "$HOME/.cache";
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_DATA_HOME = "$HOME/.local/share";
-    XDG_STATE_HOME = "$HOME/.local/state";
-  };
-
   environment.systemPackages = with pkgs; [
     vim
     wget