From cc5340759914957b97c3bfee0c3c5d05e99ce7ac Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Tue, 8 Apr 2025 23:07:00 +0100
Subject: [PATCH] Move t480 services

---
 hosts/t480/configuration.nix               | 30 +++++++++++++++++++++-
 hosts/t480/{services => modules}/cron.nix  |  0
 hosts/t480/services/default.nix            | 27 -------------------
 hosts/t480/services/interception-tools.nix | 25 ------------------
 hosts/t480/services/udev.nix               |  9 -------
 hosts/t480/services/xserver.nix            | 10 --------
 6 files changed, 29 insertions(+), 72 deletions(-)
 rename hosts/t480/{services => modules}/cron.nix (100%)
 delete mode 100644 hosts/t480/services/default.nix
 delete mode 100644 hosts/t480/services/interception-tools.nix
 delete mode 100644 hosts/t480/services/udev.nix
 delete mode 100644 hosts/t480/services/xserver.nix

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 0825ae7f..85879454 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -10,7 +10,6 @@ in
   imports = [
     ./hardware-configuration.nix
     ./secrets.nix
-    ./services
 
     ../../modules/editor/nvim.nix
     ../../modules/mixins/bluetooth.nix
@@ -42,6 +41,7 @@ in
 
     ../../users/opdavies
 
+    ./modules/cron.nix
     ./modules/neomutt.nix
     ./modules/newsboat
     ./modules/notes.nix
@@ -116,4 +116,32 @@ in
   networking.hosts = {
     "192.168.1.116" = [ "nixedo" ];
   };
+
+  services = {
+    auto-cpufreq.enable = true;
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    gvfs.enable = true;
+    openssh.enable = true;
+    power-profiles-daemon.enable = false;
+    printing.enable = true;
+    pulseaudio.enable = false;
+    throttled.enable = true;
+    thermald.enable = true;
+    upower.enable = true;
+
+    xserver = {
+      enable = true;
+
+      xkb = {
+        layout = "gb";
+        variant = "";
+      };
+    };
+  };
 }
diff --git a/hosts/t480/services/cron.nix b/hosts/t480/modules/cron.nix
similarity index 100%
rename from hosts/t480/services/cron.nix
rename to hosts/t480/modules/cron.nix
diff --git a/hosts/t480/services/default.nix b/hosts/t480/services/default.nix
deleted file mode 100644
index 43be0082..00000000
--- a/hosts/t480/services/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  imports = [
-    ./cron.nix
-    ./interception-tools.nix
-    ./udev.nix
-    ./xserver.nix
-  ];
-
-  services = {
-    auto-cpufreq.enable = true;
-
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
-    gvfs.enable = true;
-    openssh.enable = true;
-    power-profiles-daemon.enable = false;
-    printing.enable = true;
-    pulseaudio.enable = false;
-    throttled.enable = true;
-    thermald.enable = true;
-    upower.enable = true;
-  };
-}
diff --git a/hosts/t480/services/interception-tools.nix b/hosts/t480/services/interception-tools.nix
deleted file mode 100644
index 96e43b85..00000000
--- a/hosts/t480/services/interception-tools.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Make Caps lock work as an Escape key on press and Ctrl on hold.
-  services.interception-tools =
-    let
-      dfkConfig = pkgs.writeText "dual-function-keys.yaml" ''
-        MAPPINGS:
-          - KEY: KEY_CAPSLOCK
-            TAP: KEY_ESC
-            HOLD: KEY_LEFTCTRL
-      '';
-    in
-    {
-      enable = true;
-      plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
-      udevmonConfig = ''
-        - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
-          DEVICE:
-            NAME: "AT Translated Set 2 keyboard"
-            EVENTS:
-              EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]]
-      '';
-    };
-}
diff --git a/hosts/t480/services/udev.nix b/hosts/t480/services/udev.nix
deleted file mode 100644
index 732ca1d6..00000000
--- a/hosts/t480/services/udev.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  services.udev = {
-    enable = true;
-
-    extraRules = ''
-      KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
-    '';
-  };
-}
diff --git a/hosts/t480/services/xserver.nix b/hosts/t480/services/xserver.nix
deleted file mode 100644
index 4120a2cf..00000000
--- a/hosts/t480/services/xserver.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  services.xserver = {
-    enable = true;
-
-    xkb = {
-      layout = "gb";
-      variant = "";
-    };
-  };
-}