re-work cli aspect for nixos and homeModules

aspects/hosts/rotterdam.nix

@@ -1,4 +1,5 @@
-{ inputs, ... }:
+{ inputs, lib, ... }:
+
 {
   flake.nixosConfigurations.rotterdam = inputs.nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
@@ -12,53 +13,48 @@
           inputs.self.overlays.default
         ];
       }
-
-      # Common aspects (always included)
-      inputs.self.modules.nixos.common-boot
-      inputs.self.modules.nixos.common-console
-      inputs.self.modules.nixos.common-firewall
-      inputs.self.modules.nixos.common-locale
-      inputs.self.modules.nixos.common-nix
-      inputs.self.modules.nixos.common-openssh
-      inputs.self.modules.nixos.common-programs
-      inputs.self.modules.nixos.common-security
-      inputs.self.modules.nixos.common-services
-      inputs.self.modules.nixos.common-tailscale
-
-      # User aspects
-      inputs.self.modules.nixos.user
-      inputs.self.modules.nixos.root
-
-      # Desktop aspects
-      inputs.self.modules.nixos.desktop-boot
-      inputs.self.modules.nixos.desktop-desktop
-      inputs.self.modules.nixos.desktop-nix
-      inputs.self.modules.nixos.desktop-services
-
-      # Other aspects based on tags
-      inputs.self.modules.nixos.ai
-      inputs.self.modules.nixos.bluetooth
-      inputs.self.modules.nixos.dev
-      inputs.self.modules.nixos.fwupd
-      inputs.self.modules.nixos.gaming-steam
-      inputs.self.modules.nixos.gaming-hardware
-      inputs.self.modules.nixos.gaming-flatpak
-      inputs.self.modules.nixos.gaming-launchers
-      inputs.self.modules.nixos.libvirtd
-      inputs.self.modules.nixos.networkmanager
-      inputs.self.modules.nixos.podman
-
-      # Factory-generated ephemeral module
+      ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_rotterdam)
       (inputs.self.factory.ephemeral {
         rootDevice = "/dev/mapper/cryptroot";
       })
+    ]
+    ++ (with inputs.self.modules.nixos; [
+      cli
 
-      # Host-specific files (from _rotterdam/)
-      ./_rotterdam/hardware-configuration.nix
-      ./_rotterdam/boot.nix
-      ./_rotterdam/hardware.nix
-      ./_rotterdam/programs.nix
-      ./_rotterdam/services.nix
-    ];
+      # Common aspects (always included)
+      common-boot
+      common-console
+      common-firewall
+      common-locale
+      common-nix
+      common-openssh
+      common-programs
+      common-security
+      common-services
+      common-tailscale
+
+      # User aspects
+      user
+      root
+
+      # Desktop aspects
+      desktop-boot
+      desktop-desktop
+      desktop-nix
+      desktop-services
+
+      # Other aspects based on tags
+      ai
+      bluetooth
+      dev
+      fwupd
+      gaming-steam
+      gaming-hardware
+      gaming-flatpak
+      gaming-launchers
+      libvirtd
+      networkmanager
+      podman
+    ]);
   };
 }