refactor: compose hosts and home-manager features explicitly

modules/hosts/zenith/default.nix

@@ -5,13 +5,12 @@
 }:
 let
   nixosModules = config.flake.modules.nixos;
+  homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
 in
 {
   flake.modules.nixos.zenith = metaLib.mkHost {
     name = "zenith";
-    kind = "workstation";
-    traits = [ "portable" ];
 
     displays = {
       "California Institute of Technology 0x1410 Unknown" = {
@@ -35,10 +34,27 @@ in
     };
 
     imports = [
-      nixosModules."workstation-base"
-      nixosModules."portable-host"
-      nixosModules."user-kiri"
-      nixosModules."user-ergon"
+      nixosModules.workstation-base
+      (metaLib.mkHostUser {
+        account = metaLib.users.kiri;
+        needsPassword = true;
+        homeImports = [
+          homeModules.kiri-workstation
+          homeModules.noctalia-portable
+        ];
+      })
+      (metaLib.mkHostUser {
+        account = metaLib.users.ergon;
+        needsPassword = true;
+        homeImports = [
+          homeModules.ergon-workstation
+          homeModules.noctalia-portable
+        ];
+      })
+      {
+        hardware.enableRedistributableFirmware = true;
+        services.fwupd.enable = true;
+      }
       ./_hardware.nix
       inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
     ];