Refactor back to a more modular configuration

hosts/lemp11/configuration.nix

@@ -1,61 +1,20 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  imports = with inputs.self.nixosModules; [
+  imports = [
+    ../common
     ./hardware-configuration.nix
+    ./programs.nix
+    ./services.nix
 
-    mixins-avahi
-    mixins-bluetooth
-    mixins-common
-    mixins-zram
-    mixins-zsh
-
-    users-opdavies
-    users-eric
+    ../../users/opdavies.nix
+    ../../users/eric.nix
   ];
 
-  services = {
-    auto-cpufreq.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;
-    };
-  };
-
-  programs = {
-    firefox = {
-      enable = true;
-      languagePacks = [ "en-GB" ];
-      preferences = {
-        "intl.accept_languages" = "en-GB, en";
-        "intl.regional_prefs.use_os_locales" = true;
-      };
+  nixosModules = {
+    core = {
+      bluetooth.enable = true;
+      zram.enable = true;
     };
   };
 

hosts/lemp11/programs.nix

@@ -0,0 +1,13 @@
+{
+  programs = {
+    firefox = {
+      enable = true;
+
+      languagePacks = [ "en-GB" ];
+      preferences = {
+        "intl.accept_languages" = "en-GB, en";
+        "intl.regional_prefs.use_os_locales" = true;
+      };
+    };
+  };
+}

hosts/lemp11/services.nix

@@ -0,0 +1,35 @@
+{
+  services = {
+    auto-cpufreq.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;
+    };
+  };
+}