From 8732ff783dfadadd31609de0099db2583209756f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 2 Jul 2025 22:16:32 +0100
Subject: [PATCH] Refactor

---
 hosts/t480/configuration.nix                  | 22 +++++++++++++++----
 hosts/t480/{modules => }/cron.nix             |  0
 hosts/t480/modules/default.nix                |  8 -------
 hosts/t480/{modules => }/neomutt.nix          |  0
 hosts/t480/{modules => }/newsboat/default.nix |  0
 hosts/t480/{modules => }/newsboat/urls.nix    |  0
 hosts/t480/{modules => }/ollama.nix           |  0
 hosts/t480/services/default.nix               | 17 --------------
 hosts/t480/{services => }/xserver.nix         |  0
 9 files changed, 18 insertions(+), 29 deletions(-)
 rename hosts/t480/{modules => }/cron.nix (100%)
 delete mode 100644 hosts/t480/modules/default.nix
 rename hosts/t480/{modules => }/neomutt.nix (100%)
 rename hosts/t480/{modules => }/newsboat/default.nix (100%)
 rename hosts/t480/{modules => }/newsboat/urls.nix (100%)
 rename hosts/t480/{modules => }/ollama.nix (100%)
 delete mode 100644 hosts/t480/services/default.nix
 rename hosts/t480/{services => }/xserver.nix (100%)

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index dd407942..1ba019f5 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -9,15 +9,16 @@
     ../common
 
     ./hardware-configuration.nix
-    ./modules
+    ./cron.nix
+    ./neomutt.nix
+    ./newsboat
+    ./ollama.nix
     ./secrets.nix
-    ./services
+    ./xserver.nix
 
     ../../users/opdavies.nix
   ];
 
-  services.geoclue2.enable = true;
-
   cli = {
     kanata = {
       enable = true;
@@ -55,6 +56,19 @@
     thunar.enable = true;
   };
 
+  services = {
+    auto-cpufreq.enable = true;
+    geoclue2.enable = true;
+    gvfs.enable = true;
+    power-profiles-daemon.enable = false;
+    printing.enable = true;
+    pulseaudio.enable = false;
+    tailscale.enable = true;
+    thermald.enable = true;
+    throttled.enable = true;
+    upower.enable = true;
+  };
+
   boot = {
     loader = {
       systemd-boot = {
diff --git a/hosts/t480/modules/cron.nix b/hosts/t480/cron.nix
similarity index 100%
rename from hosts/t480/modules/cron.nix
rename to hosts/t480/cron.nix
diff --git a/hosts/t480/modules/default.nix b/hosts/t480/modules/default.nix
deleted file mode 100644
index c5f2ed09..00000000
--- a/hosts/t480/modules/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./cron.nix
-    ./neomutt.nix
-    ./newsboat
-    ./ollama.nix
-  ];
-}
diff --git a/hosts/t480/modules/neomutt.nix b/hosts/t480/neomutt.nix
similarity index 100%
rename from hosts/t480/modules/neomutt.nix
rename to hosts/t480/neomutt.nix
diff --git a/hosts/t480/modules/newsboat/default.nix b/hosts/t480/newsboat/default.nix
similarity index 100%
rename from hosts/t480/modules/newsboat/default.nix
rename to hosts/t480/newsboat/default.nix
diff --git a/hosts/t480/modules/newsboat/urls.nix b/hosts/t480/newsboat/urls.nix
similarity index 100%
rename from hosts/t480/modules/newsboat/urls.nix
rename to hosts/t480/newsboat/urls.nix
diff --git a/hosts/t480/modules/ollama.nix b/hosts/t480/ollama.nix
similarity index 100%
rename from hosts/t480/modules/ollama.nix
rename to hosts/t480/ollama.nix
diff --git a/hosts/t480/services/default.nix b/hosts/t480/services/default.nix
deleted file mode 100644
index 68c40e89..00000000
--- a/hosts/t480/services/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  imports = [
-    ./xserver.nix
-  ];
-
-  services = {
-    auto-cpufreq.enable = true;
-    gvfs.enable = true;
-    power-profiles-daemon.enable = false;
-    printing.enable = true;
-    pulseaudio.enable = false;
-    tailscale.enable = true;
-    throttled.enable = true;
-    thermald.enable = true;
-    upower.enable = true;
-  };
-}
diff --git a/hosts/t480/services/xserver.nix b/hosts/t480/xserver.nix
similarity index 100%
rename from hosts/t480/services/xserver.nix
rename to hosts/t480/xserver.nix