diff --git a/modules/hm-system-defaults.nix b/modules/hm-system-defaults.nix
index d4975a3..7f296ea 100644
--- a/modules/hm-system-defaults.nix
+++ b/modules/hm-system-defaults.nix
@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, lib, ... }: {
   home-manager = {
     extraSpecialArgs = {
       main = config;
@@ -9,12 +9,14 @@
         home.sessionVariables = {
           inherit (config.environment.sessionVariables) NIX_PATH;
         };
-        xdg.configFile."nix/registry.json".text =
-          config.environment.etc."nix/registry.json".text;
-      }
-      {
-        xdg.enable = true;
+        xdg = {
+          configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;
+          enable = true;
+        };
       }
+      (lib.mkIf config.services.xserver.enable {
+        xsession.enable = true;
+      })
     ];
   };
 }