From b3f45b143b64fcef17dd5e8614f8d29e92934224 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 22 May 2025 12:39:19 +0100
Subject: [PATCH] Move xserver service configuration

---
 hosts/t480/configuration.nix                      |  2 +-
 hosts/t480/{services.nix => services/default.nix} | 15 ++++-----------
 hosts/t480/services/xserver.nix                   | 12 ++++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename hosts/t480/{services.nix => services/default.nix} (65%)
 create mode 100644 hosts/t480/services/xserver.nix

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 61796b4f..941e944b 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -7,7 +7,7 @@
     ./hardware-configuration.nix
     ./modules
     ./secrets.nix
-    ./services.nix
+    ./services
 
     ../../users/opdavies.nix
   ];
diff --git a/hosts/t480/services.nix b/hosts/t480/services/default.nix
similarity index 65%
rename from hosts/t480/services.nix
rename to hosts/t480/services/default.nix
index 6202d625..68c40e89 100644
--- a/hosts/t480/services.nix
+++ b/hosts/t480/services/default.nix
@@ -1,4 +1,8 @@
 {
+  imports = [
+    ./xserver.nix
+  ];
+
   services = {
     auto-cpufreq.enable = true;
     gvfs.enable = true;
@@ -9,16 +13,5 @@
     throttled.enable = true;
     thermald.enable = true;
     upower.enable = true;
-
-    xserver = {
-      enable = true;
-
-      displayManager.startx.enable = true;
-
-      xkb = {
-        layout = "gb";
-        variant = "";
-      };
-    };
   };
 }
diff --git a/hosts/t480/services/xserver.nix b/hosts/t480/services/xserver.nix
new file mode 100644
index 00000000..ab1cfb91
--- /dev/null
+++ b/hosts/t480/services/xserver.nix
@@ -0,0 +1,12 @@
+{
+  services.xserver = {
+    enable = true;
+
+    displayManager.startx.enable = true;
+
+    xkb = {
+      layout = "gb";
+      variant = "";
+    };
+  };
+}