diff --git a/modules/hosts/computer-nadine/imports.nix b/modules/hosts/computer-nadine/computer-nadine.nix
similarity index 54%
rename from modules/hosts/computer-nadine/imports.nix
rename to modules/hosts/computer-nadine/computer-nadine.nix
index ec5867e..304e856 100644
--- a/modules/hosts/computer-nadine/imports.nix
+++ b/modules/hosts/computer-nadine/computer-nadine.nix
@@ -1,5 +1,10 @@
 { inputs, config, ... }: {
-  flake.nixosModules.computer-nadine = { ... }: {
+  flake.nixosConfigurations."computer-nadine" = inputs.self.lib.mkHost {
+    system = "x86_64-linux";
+    host   = "computer-nadine";
+  };
+
+  flake.nixosModules.computer-nadine = { system, ... }: {
     imports = with inputs.self.nixosModules; [
       apps-sys-chrome
       apps-sys-vesktop
@@ -23,5 +28,10 @@
       kde-usr-plasma-nadine
       security-usr-sopsnix
     ];
+
+    boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" ];
+    nixpkgs.hostPlatform = system;
+    hardware.cpu.amd.updateMicrocode = true;
   };
 }
diff --git a/modules/hosts/computer-nadine/hardware.nix b/modules/hosts/computer-nadine/hardware.nix
deleted file mode 100644
index 56a52ed..0000000
--- a/modules/hosts/computer-nadine/hardware.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.computer-nadine = { system, ... }: {
-    boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" ];
-    nixpkgs.hostPlatform = system;
-    hardware.cpu.amd.updateMicrocode = true;
-  };
-}
diff --git a/modules/hosts/computer-nadine/nixosConfigurations.nix b/modules/hosts/computer-nadine/nixosConfigurations.nix
deleted file mode 100644
index 8224809..0000000
--- a/modules/hosts/computer-nadine/nixosConfigurations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosConfigurations."computer-nadine" = inputs.self.lib.mkHost {
-    system = "x86_64-linux";
-    host   = "computer-nadine";
-  };
-}
diff --git a/modules/hosts/deck/imports.nix b/modules/hosts/deck/deck.nix
similarity index 54%
rename from modules/hosts/deck/imports.nix
rename to modules/hosts/deck/deck.nix
index 766f150..7facbd5 100644
--- a/modules/hosts/deck/imports.nix
+++ b/modules/hosts/deck/deck.nix
@@ -1,5 +1,10 @@
 { inputs, config, ... }: {
-  flake.nixosModules.deck = { ... }: {
+  flake.nixosConfigurations."deck" = inputs.self.lib.mkHost {
+    system = "x86_64-linux";
+    host   = "deck";
+  };
+
+  flake.nixosModules.deck = { system, ... }: {
     imports = with inputs.self.nixosModules; [
       apps-sys-chrome
       apps-sys-vesktop
@@ -22,5 +27,10 @@
       kde-usr-plasma-deck
       security-usr-sopsnix
     ];
+
+    boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" ];
+    nixpkgs.hostPlatform = system;
+    hardware.cpu.amd.updateMicrocode = true;
   };
 }
diff --git a/modules/hosts/deck/hardware.nix b/modules/hosts/deck/hardware.nix
deleted file mode 100644
index f2c59bf..0000000
--- a/modules/hosts/deck/hardware.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.computer-deck = { system, ... }: {
-    boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" ];
-    nixpkgs.hostPlatform = system;
-    hardware.cpu.amd.updateMicrocode = true;
-  };
-}
diff --git a/modules/hosts/deck/nixosConfigurations.nix b/modules/hosts/deck/nixosConfigurations.nix
deleted file mode 100644
index 3f226c7..0000000
--- a/modules/hosts/deck/nixosConfigurations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosConfigurations."deck" = inputs.self.lib.mkHost {
-    system = "x86_64-linux";
-    host   = "deck";
-  };
-}