re-work cli aspect for nixos and homeModules

aspects/hosts/trantor.nix

@@ -1,4 +1,4 @@
-{ inputs, self, ... }:
+{ inputs, lib, ... }:
 {
   flake.nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
     system = "aarch64-linux";
@@ -13,42 +13,36 @@
         ];
       }
 
-      # 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
-
-      # Server aspects
-      inputs.self.modules.nixos.server-boot
-      inputs.self.modules.nixos.server-nix
-      inputs.self.modules.nixos.server-tailscale
-
       # Factory-generated ephemeral module
       (inputs.self.factory.ephemeral {
         rootDevice = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2";
       })
 
-      # Host-specific files (from _trantor/)
-      ./_trantor/hardware-configuration.nix
-      ./_trantor/disko.nix
-      ./_trantor/boot.nix
-      ./_trantor/fail2ban.nix
-      ./_trantor/forgejo.nix
-      ./_trantor/networking.nix
-      ./_trantor/nginx.nix
-      ./_trantor/openssh.nix
-      ./_trantor/unbound.nix
-    ];
+      ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_trantor)
+    ]
+    ++ (with inputs.self.modules.nixos; [
+      cli
+
+      # 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
+
+      # Server aspects
+      server-boot
+      server-nix
+      server-tailscale
+    ]);
   };
 }