From 26e35dd7779e5deaf67c831eedc03025e75aad19 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 27 Mar 2024 21:49:03 +0000
Subject: [PATCH] Move some more config over

---
 common.nix                       |  2 ++
 hardware/p8-laptop.nix           | 21 +++++++++++++++++++++
 machines/talos/configuration.nix | 19 -------------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/common.nix b/common.nix
index 99b0b1f..24ce6c8 100644
--- a/common.nix
+++ b/common.nix
@@ -5,6 +5,8 @@
         ./users.nix
     ];
 
+    system.copySystemConfiguration = true;
+
     # Set your time zone.
     time.timeZone = "Europe/London";
 
diff --git a/hardware/p8-laptop.nix b/hardware/p8-laptop.nix
index c6aa91c..ffe2f3f 100644
--- a/hardware/p8-laptop.nix
+++ b/hardware/p8-laptop.nix
@@ -25,6 +25,27 @@
         '';
         }
     ];
+
+    # The keyboard is US layout
+    services.xserver.xkb.layout = "us";
+
+    # Enable sensors
+    hardware.sensor.iio.enable = true;
+
+    # Enable sound.
+    sound.enable = true;
+    hardware.pulseaudio.enable = true;
+
+    # Enable touch input
+    services.xserver.libinput.enable = true;
+
+    # Enable some standard services
+    services = {
+        upower.enable = true;
+        thermald.enable = true;
+        fwupd.enable = true;
+        smartd.enable = true;
+    };
 }
 
 
diff --git a/machines/talos/configuration.nix b/machines/talos/configuration.nix
index c30c877..313efe4 100644
--- a/machines/talos/configuration.nix
+++ b/machines/talos/configuration.nix
@@ -8,7 +8,6 @@
       ../../common.nix
     ];
 
-  system.copySystemConfiguration = true;
   system.stateVersion = "23.11";
 
   # Use the systemd-boot EFI boot loader.
@@ -24,15 +23,6 @@
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.displayManager.gdm.wayland = true;
   services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.xkb.layout = "us";
-  services.xserver.libinput.enable = true;
-
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
-  # Enable sensors
-  hardware.sensor.iio.enable = true;
 
   # List packages installed in system profile
   environment.systemPackages = with pkgs; [
@@ -43,13 +33,4 @@
     flashrom.enable = true;
     gnome-terminal.enable = true;
   };
-
-  # Enable the OpenSSH daemon.
-  services = {
-    locate.enable = true;
-    upower.enable = true;
-    thermald.enable = true;
-    fwupd.enable = true;
-    smartd.enable = true;
-  };
 }
\ No newline at end of file