diff --git a/flake.nix b/flake.nix
index 24044c9..ed3b936 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
           modules = [
             agenix.nixosModules.default
 
-            ./nix/hosts/lemp11
+            ./nix/hosts/lemp11/configuration.nix
           ];
         };
 
@@ -87,7 +87,7 @@
           modules = [
             agenix.nixosModules.default
 
-            ./nix/hosts/nixedo
+            ./nix/hosts/nixedo/configuration.nix
           ];
         };
 
@@ -102,7 +102,7 @@
             nixos-hardware.nixosModules.common-gpu-intel
             nixos-hardware.nixosModules.lenovo-thinkpad-t490
 
-            ./nix/hosts/t490
+            ./nix/hosts/t490/configuration.nix
           ];
         };
 
@@ -120,7 +120,7 @@
             disko.nixosModules.disko
             nixos-wsl.nixosModules.default
 
-            ./nix/hosts/PW05CH3L
+            ./nix/hosts/PW05CH3L/configuration.nix
           ];
         };
 
diff --git a/nix/hosts/PW05CH3L/configuration.nix b/nix/hosts/PW05CH3L/configuration.nix
index ccc0d6e..24afffe 100644
--- a/nix/hosts/PW05CH3L/configuration.nix
+++ b/nix/hosts/PW05CH3L/configuration.nix
@@ -1,6 +1,24 @@
-{ inputs, ... }:
+{ inputs, username, ... }:
 
 {
+  imports = [
+    ../common
+    ../../users/opdavies
+
+    ./configuration.nix
+  ];
+
+  features = {
+    cli = {
+      docker.enable = true;
+    };
+  };
+
+  wsl = {
+    enable = true;
+    defaultUser = username;
+  };
+
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
   nix = {
diff --git a/nix/hosts/PW05CH3L/default.nix b/nix/hosts/PW05CH3L/default.nix
deleted file mode 100644
index 1646bc4..0000000
--- a/nix/hosts/PW05CH3L/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ username, ... }:
-
-{
-  imports = [
-    ../common
-    ../../users/opdavies
-
-    ./configuration.nix
-  ];
-
-  features = {
-    cli = {
-      docker.enable = true;
-    };
-  };
-
-  wsl = {
-    enable = true;
-    defaultUser = username;
-  };
-}
diff --git a/nix/hosts/lemp11/configuration.nix b/nix/hosts/lemp11/configuration.nix
index 478bc2b..f7a437d 100644
--- a/nix/hosts/lemp11/configuration.nix
+++ b/nix/hosts/lemp11/configuration.nix
@@ -15,6 +15,8 @@
 
     ./hardware-configuration.nix
 
+    ../common
+    ../../users/opdavies
     ../../users/eric
     ../../users/luke
   ];
diff --git a/nix/hosts/lemp11/default.nix b/nix/hosts/lemp11/default.nix
deleted file mode 100644
index 57b6c7c..0000000
--- a/nix/hosts/lemp11/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ ... }:
-
-{
-  features = {
-    cli = {
-      docker.enable = true;
-    };
-
-    desktop = {
-      autorandr.enable = true;
-      gaming.enable = true;
-      peek.enable = true;
-    };
-
-    homelab = {
-      forgejo.enable = true;
-      gitea.enable = true;
-      immich.enable = true;
-      jellyfin.enable = true;
-      paperless.enable = true;
-      pihole.enable = true;
-      tubearchivist-container.enable = true;
-    };
-  };
-
-  imports = [
-    ../common
-    ../../users/opdavies
-
-    ./configuration.nix
-  ];
-}
diff --git a/nix/hosts/nixedo/configuration.nix b/nix/hosts/nixedo/configuration.nix
index 635a22f..ec4c07e 100644
--- a/nix/hosts/nixedo/configuration.nix
+++ b/nix/hosts/nixedo/configuration.nix
@@ -6,11 +6,35 @@
 
 {
   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 = {
@@ -34,4 +58,12 @@
   ];
 
   services.caddy.enable = true;
+
+  programs.dconf.enable = true;
+
+  services.logind.lidSwitchExternalPower = "ignore";
+
+  age.identityPaths = [
+    "/home/opdavies/.ssh/id_rsa"
+  ];
 }
diff --git a/nix/hosts/nixedo/default.nix b/nix/hosts/nixedo/default.nix
deleted file mode 100644
index 5a6d0ad..0000000
--- a/nix/hosts/nixedo/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  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
-  ];
-}
diff --git a/nix/hosts/nixedo/extra.nix b/nix/hosts/nixedo/extra.nix
deleted file mode 100644
index 0218882..0000000
--- a/nix/hosts/nixedo/extra.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  programs.dconf.enable = true;
-
-  services.logind.lidSwitchExternalPower = "ignore";
-
-  age.identityPaths = [
-    "/home/opdavies/.ssh/id_rsa"
-  ];
-}
diff --git a/nix/hosts/t490/configuration.nix b/nix/hosts/t490/configuration.nix
index 399816b..aca3496 100644
--- a/nix/hosts/t490/configuration.nix
+++ b/nix/hosts/t490/configuration.nix
@@ -8,8 +8,21 @@
 {
   imports = [
     ./hardware-configuration.nix
+
+    ../common
+    ../../users/opdavies
+
   ];
 
+  features = {
+    desktop = {
+      autorandr.enable = true;
+      gaming.enable = true;
+      i3.enable = true;
+      peek.enable = true;
+    };
+  };
+
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
   boot = {
diff --git a/nix/hosts/t490/default.nix b/nix/hosts/t490/default.nix
deleted file mode 100644
index 2d76c26..0000000
--- a/nix/hosts/t490/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  imports = [
-    ../common
-    ../../users/opdavies
-
-    ./configuration.nix
-  ];
-
-  features = {
-    desktop = {
-      autorandr.enable = true;
-      gaming.enable = true;
-      i3.enable = true;
-      peek.enable = true;
-    };
-  };
-}