Refactor back to a more modular configuration

hosts/t490/configuration.nix

@@ -1,20 +1,27 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  imports = with inputs.self.nixosModules; [
+  imports = [
+    ../common
+
     ./hardware-configuration.nix
     ./hardware.nix
-    ./programs.nix
     ./secrets.nix
     ./services
     ./users.nix
 
-    mixins-common
-    mixins-zram
-
-    users-opdavies
+    ../../users/opdavies.nix
   ];
 
+  nixosModules = {
+    core = {
+      bluetooth.enable = true;
+      zram.enable = true;
+    };
+
+    desktop.dconf.enable = true;
+  };
+
   boot = {
     loader = {
       systemd-boot = {

hosts/t490/programs.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs = {
-    dconf.enable = true;
-  };
-}