From 82f13393ffe77ebc89d25d210bfc0291e7603f88 Mon Sep 17 00:00:00 2001
From: Mohamed Chrayed <mohamed@chrayed.de>
Date: Fri, 6 Mar 2026 12:00:46 +0100
Subject: [PATCH] combine

---
 .../computer-mo/{imports.nix => computer-mo.nix}     | 12 +++++++++++-
 modules/hosts/computer-mo/hardware.nix               |  8 --------
 modules/hosts/computer-mo/nixosConfigurations.nix    |  6 ------
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename modules/hosts/computer-mo/{imports.nix => computer-mo.nix} (60%)
 delete mode 100644 modules/hosts/computer-mo/hardware.nix
 delete mode 100644 modules/hosts/computer-mo/nixosConfigurations.nix

diff --git a/modules/hosts/computer-mo/imports.nix b/modules/hosts/computer-mo/computer-mo.nix
similarity index 60%
rename from modules/hosts/computer-mo/imports.nix
rename to modules/hosts/computer-mo/computer-mo.nix
index c54999c..aa6aa2b 100644
--- a/modules/hosts/computer-mo/imports.nix
+++ b/modules/hosts/computer-mo/computer-mo.nix
@@ -1,5 +1,10 @@
 { inputs, config, ... }: {
-  flake.nixosModules.computer-mo = { ... }: {
+  flake.nixosConfigurations."computer-mo" = inputs.self.lib.mkHost {
+    system = "x86_64-linux";
+    host   = "computer-mo";
+  };
+
+  flake.nixosModules.computer-mo = { system, ... }: {
     imports = with inputs.self.nixosModules; [
       apps-sys-brave
       apps-sys-onepassword
@@ -30,5 +35,10 @@
       gnome-usr-gnome-mo
       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-mo/hardware.nix b/modules/hosts/computer-mo/hardware.nix
deleted file mode 100644
index 1f88e94..0000000
--- a/modules/hosts/computer-mo/hardware.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.computer-mo = { 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-mo/nixosConfigurations.nix b/modules/hosts/computer-mo/nixosConfigurations.nix
deleted file mode 100644
index 5b3d355..0000000
--- a/modules/hosts/computer-mo/nixosConfigurations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosConfigurations."computer-mo" = inputs.self.lib.mkHost {
-    system = "x86_64-linux";
-    host   = "computer-mo";
-  };
-}