Move some more config over

common.nix

@@ -5,6 +5,8 @@
         ./users.nix
     ];
 
+    system.copySystemConfiguration = true;
+
     # Set your time zone.
     time.timeZone = "Europe/London";
 

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;
+    };
 }
 
 

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;
-  };
 }