diff --git a/modules/core/default.nix b/modules/core/default.nix
index d7aa66f..0ab7818 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -9,7 +9,6 @@
   imports =
     [(import ./bootloader.nix)]
     ++ [(import ./hardware.nix)]
-    ++ [(import ./xserver.nix)]
     ++ [(import ./nix.nix)]
     ++ [(import ./network.nix)]
     ++ [(import ./pipewire.nix)]
diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix
deleted file mode 100644
index 1f87711..0000000
--- a/modules/core/xserver.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  pkgs,
-  username,
-  ...
-}: {
-  services = {
-    xserver = {
-      enable = true;
-      xkb.layout = "es,us";
-    };
-
-    displayManager.autoLogin = {
-      enable = true;
-      user = "${username}";
-    };
-    libinput = {
-      enable = true;
-      # mouse = {
-      #   accelProfile = "flat";
-      # };
-    };
-  };
-  # To prevent getting stuck at shutdown
-  systemd.extraConfig = "DefaultTimeoutStopSec=10s";
-
-  environment.systemPackages = [pkgs.xorg.xhost]; # GParted (and others) won't start if not installed
-}