From 20ec9fde321b68829618c7d535612f50c35cb707 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 29 Jan 2025 01:15:42 +0000
Subject: [PATCH] lemp11: split configuration

---
 nix/hosts/lemp11/configuration.nix | 71 ++----------------------------
 nix/hosts/lemp11/hardware.nix      |  6 +++
 nix/hosts/lemp11/programs.nix      | 20 +++++++++
 nix/hosts/lemp11/services.nix      | 43 ++++++++++++++++++
 4 files changed, 72 insertions(+), 68 deletions(-)
 create mode 100644 nix/hosts/lemp11/hardware.nix
 create mode 100644 nix/hosts/lemp11/programs.nix
 create mode 100644 nix/hosts/lemp11/services.nix

diff --git a/nix/hosts/lemp11/configuration.nix b/nix/hosts/lemp11/configuration.nix
index a6f9ae0..8ae4bdb 100644
--- a/nix/hosts/lemp11/configuration.nix
+++ b/nix/hosts/lemp11/configuration.nix
@@ -9,6 +9,9 @@
     inputs.nixos-hardware.nixosModules.system76
 
     ./hardware-configuration.nix
+    ./hardware.nix
+    ./programs.nix
+    ./services.nix
 
     ../common
     ../../users/opdavies
@@ -33,55 +36,17 @@
     };
   };
 
-  services.thermald.enable = true;
-  services.power-profiles-daemon.enable = false;
-
   systemd.extraConfig = ''
     DefaultTimeoutStopSec=10s
   '';
 
   networking.networkmanager.enable = true;
 
-  services.xserver.enable = true;
-
-  services.xserver = {
-    xkb = {
-      layout = "gb";
-      variant = "";
-    };
-
-    displayManager.lightdm.enable = true;
-    desktopManager.cinnamon.enable = true;
-  };
-
-  services.avahi.enable = true;
-  services.avahi.nssmdns4 = true;
-  services.avahi.openFirewall = true;
-
-  services.printing.enable = true;
-
-  services.pulseaudio.enable = false;
-
-  hardware.bluetooth.enable = true;
-
   security = {
     polkit.enable = true;
     rtkit.enable = true;
   };
 
-  services.pipewire = {
-    enable = true;
-
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-
-    pulse.enable = true;
-  };
-
-  services.openssh.enable = true;
-
   zramSwap.enable = true;
 
   nix = {
@@ -102,34 +67,4 @@
       warn-dirty = false;
     };
   };
-
-  services.gvfs.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-qt;
-  };
-
-  programs.firefox = {
-    enable = true;
-    languagePacks = [ "en-GB" ];
-    preferences = {
-      "intl.accept_languages" = "en-GB, en";
-      "intl.regional_prefs.use_os_locales" = true;
-    };
-  };
-
-  services.blueman.enable = true;
-
-  services.auto-cpufreq.enable = true;
-
-  services.udev = {
-    enable = true;
-    extraRules = ''
-      KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
-    '';
-  };
-
-  hardware.sane.enable = true;
 }
diff --git a/nix/hosts/lemp11/hardware.nix b/nix/hosts/lemp11/hardware.nix
new file mode 100644
index 0000000..a312350
--- /dev/null
+++ b/nix/hosts/lemp11/hardware.nix
@@ -0,0 +1,6 @@
+{
+  hardware = {
+    bluetooth.enable = true;
+    sane.enable = true;
+  };
+}
diff --git a/nix/hosts/lemp11/programs.nix b/nix/hosts/lemp11/programs.nix
new file mode 100644
index 0000000..9da9ff9
--- /dev/null
+++ b/nix/hosts/lemp11/programs.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+{
+  programs = {
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      pinentryPackage = pkgs.pinentry-qt;
+    };
+
+    firefox = {
+      enable = true;
+      languagePacks = [ "en-GB" ];
+      preferences = {
+        "intl.accept_languages" = "en-GB, en";
+        "intl.regional_prefs.use_os_locales" = true;
+      };
+    };
+  };
+}
diff --git a/nix/hosts/lemp11/services.nix b/nix/hosts/lemp11/services.nix
new file mode 100644
index 0000000..0d5dae7
--- /dev/null
+++ b/nix/hosts/lemp11/services.nix
@@ -0,0 +1,43 @@
+{
+  services = {
+    auto-cpufreq.enable = true;
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    blueman.enable = true;
+    gvfs.enable = true;
+    openssh.enable = true;
+    power-profiles-daemon.enable = false;
+    thermald.enable = true;
+
+    pipewire = {
+      enable = true;
+
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+
+      pulse.enable = true;
+    };
+
+    printing.enable = true;
+    pulseaudio.enable = false;
+
+    xserver = {
+      enable = true;
+
+      xkb = {
+        layout = "gb";
+        variant = "";
+      };
+
+      desktopManager.cinnamon.enable = true;
+      displayManager.lightdm.enable = true;
+    };
+  };
+}