diff --git a/modules/core/services.nix b/modules/core/services.nix
index a2b856e..5014a54 100644
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -10,4 +10,7 @@
     # don’t shutdown when power button is short-pressed
     HandlePowerKey=ignore
   '';
+
+  # To prevent getting stuck at shutdown.
+  systemd.extraConfig = "DefaultTimeoutStopSec=10s";
 }
diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix
index 5b970e8..15d81fa 100644
--- a/modules/core/xserver.nix
+++ b/modules/core/xserver.nix
@@ -1,12 +1,9 @@
 { username, ... }: 
 {
-  services = {
-    xserver = {
-      enable = true;
-      xkb.layout = "us";
-    };
-  };
-
-  # To prevent getting stuck at shutdown - this is not Xorg related, but I like to blame Xorg for all of my life issues.
-  systemd.extraConfig = "DefaultTimeoutStopSec=10s";
+  # services = {
+  #   xserver = {
+  #     enable = true;
+  #     xkb.layout = "us";
+  #   };
+  # };
 }