Revert "Restructure NixOS host configuration files"

This reverts commit f92ad2b5ab.

nix/hosts/nixedo/configuration.nix

@@ -6,35 +6,11 @@
 
 {
   imports = [
-    ../common
-    ../../users/opdavies
-
     ./hardware-configuration.nix
-    ./secrets.nix
 
     ./modules/acme.nix
   ];
 
-  features = {
-    cli = {
-      docker.enable = true;
-    };
-
-    homelab = {
-      audiobookshelf.enable = true;
-      beaverhabits.enable = true;
-      forgejo.enable = true;
-      freshrss.enable = true;
-      gitea.enable = true;
-      immich.enable = true;
-      jellyfin.enable = true;
-      paperless.enable = true;
-      pihole.enable = true;
-      tubearchivist-container.enable = true;
-      vaultwarden.enable = true;
-    };
-  };
-
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
   boot.loader = {
@@ -58,12 +34,4 @@
   ];
 
   services.caddy.enable = true;
-
-  programs.dconf.enable = true;
-
-  services.logind.lidSwitchExternalPower = "ignore";
-
-  age.identityPaths = [
-    "/home/opdavies/.ssh/id_rsa"
-  ];
 }

nix/hosts/nixedo/default.nix

@@ -0,0 +1,30 @@
+{
+  features = {
+    cli = {
+      docker.enable = true;
+    };
+
+    homelab = {
+      audiobookshelf.enable = true;
+      beaverhabits.enable = true;
+      forgejo.enable = true;
+      freshrss.enable = true;
+      gitea.enable = true;
+      immich.enable = true;
+      jellyfin.enable = true;
+      paperless.enable = true;
+      pihole.enable = true;
+      tubearchivist-container.enable = true;
+      vaultwarden.enable = true;
+    };
+  };
+
+  imports = [
+    ../common
+    ../../users/opdavies
+
+    ./configuration.nix
+    ./secrets.nix
+    ./extra.nix
+  ];
+}

nix/hosts/nixedo/extra.nix

@@ -0,0 +1,9 @@
+{
+  programs.dconf.enable = true;
+
+  services.logind.lidSwitchExternalPower = "ignore";
+
+  age.identityPaths = [
+    "/home/opdavies/.ssh/id_rsa"
+  ];
+}