diff --git a/hosts/astyanax/configuration.nix b/hosts/astyanax/configuration.nix
index 1299359..5ca06ef 100644
--- a/hosts/astyanax/configuration.nix
+++ b/hosts/astyanax/configuration.nix
@@ -13,6 +13,7 @@
     ./hard.nix
     ../../modules/bootloader.nix
     ../../modules/disko.zfs-encrypted-root.nix
+    ../../modules/gnome.nix
     ../../modules/bluetooth.nix
     ../../modules/keyboard
     ../../modules/networking.nix
@@ -31,12 +32,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  services.xserver = {
-    displayManager.gdm.enable = true;
-    displayManager.gdm.wayland = true;
-    desktopManager.gnome.enable = true;
-  };
-
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
diff --git a/modules/gnome.nix b/modules/gnome.nix
new file mode 100644
index 0000000..ca1de35
--- /dev/null
+++ b/modules/gnome.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver = {
+    displayManager.gdm.enable = true;
+    displayManager.gdm.wayland = true;
+    desktopManager.gnome.enable = true;
+  };
+
+  # TODO: Declare monitors.xml
+}