refactor: compose hosts and home-manager features explicitly

modules/hosts/orion/default.nix

@@ -1,10 +1,15 @@
-{ config, ... }:
+{
+  inputs,
+  config,
+  ...
+}:
 let
   nixosModules = config.flake.modules.nixos;
+  homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
 in
 {
-  flake.modules.nixos."orion-admin" =
+  flake.modules.nixos.orion-admin =
     { pkgs, ... }:
     {
       users.users.kiri = {
@@ -21,22 +26,27 @@ in
 
   flake.modules.nixos.orion = metaLib.mkHost {
     name = "orion";
-    kind = "server";
     users = {
       inherit (metaLib.users) kiri;
     };
 
     imports = [
-      nixosModules."server-base"
+      nixosModules.host-base
+      nixosModules.sops-host-ssh-key
+      nixosModules.openssh
       nixosModules.caddy
-      nixosModules."server-firewall"
-      nixosModules."ssh-agent-auth"
-      nixosModules."orion-admin"
+      nixosModules.server-firewall
+      nixosModules.ssh-agent-auth
+      nixosModules.orion-admin
       nixosModules.vaultwarden
       nixosModules.radicale
       nixosModules.actual
       nixosModules.gitea
-      nixosModules."user-kiri"
+      (metaLib.mkHostUser {
+        account = metaLib.users.kiri;
+        needsPassword = false;
+        homeImports = [ homeModules.kiri-server ];
+      })
       ./_hardware.nix
       ./_disk.nix
     ];

modules/hosts/polaris/default.nix

@@ -5,12 +5,12 @@
 }:
 let
   nixosModules = config.flake.modules.nixos;
+  homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
 in
 {
   flake.modules.nixos.polaris = metaLib.mkHost {
     name = "polaris";
-    kind = "workstation";
 
     displays = {
       "LG Electronics LG ULTRAGEAR 103NTYT8R290" = {
@@ -33,10 +33,24 @@ in
     };
 
     imports = [
-      nixosModules."workstation-base"
+      nixosModules.workstation-base
       nixosModules.steam
-      nixosModules."user-kiri"
-      nixosModules."user-ergon"
+      (metaLib.mkHostUser {
+        account = metaLib.users.kiri;
+        needsPassword = true;
+        homeImports = [
+          homeModules.kiri-workstation
+          homeModules.noctalia
+        ];
+      })
+      (metaLib.mkHostUser {
+        account = metaLib.users.ergon;
+        needsPassword = true;
+        homeImports = [
+          homeModules.ergon-workstation
+          homeModules.noctalia
+        ];
+      })
       ./_hardware.nix
     ]
     ++ (with inputs.nixos-hardware.nixosModules; [

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
     ];