refactor: simplify shared config contracts

modules/hosts/orion/default.nix

@@ -17,15 +17,13 @@ in
       ...
     }:
     let
-      terminal = metaLib.resolveUserTerminal {
+      terminal = metaLib.resolveRepoTerminal {
         inherit pkgs;
-        user = config.meta.host.users.kiri;
       };
     in
     {
       assertions = metaLib.mkTerminalAssertions {
         inherit terminal;
-        user = config.meta.host.users.kiri;
         requireTerminfo = true;
       };
 
@@ -45,7 +43,7 @@ in
     name = "orion";
     users = {
       kiri = {
-        account = metaLib.users.kiri;
+        account = metaLib.accounts.kiri;
         homeImports = [
           homeModules.shell
           homeModules.git

modules/hosts/polaris/default.nix

@@ -7,6 +7,13 @@ let
   nixosModules = config.flake.modules.nixos;
   homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
+  workstationHomeImports = [ homeModules.workstation-base ];
+  kiriHomeImports = workstationHomeImports ++ [
+    homeModules.syncthing
+    homeModules.qbittorrent-client
+    homeModules.noctalia
+  ];
+  ergonHomeImports = workstationHomeImports ++ [ homeModules.noctalia ];
 in
 {
   flake.modules.nixos.polaris = metaLib.mkHost {
@@ -31,29 +38,20 @@ in
 
     users = {
       kiri = {
-        account = metaLib.users.kiri;
+        account = metaLib.accounts.kiri;
         needsPassword = true;
-        homeImports = [
-          homeModules.workstation-base
-          homeModules.syncthing
-          homeModules.qbittorrent-client
-          homeModules.noctalia
-        ];
+        homeImports = kiriHomeImports;
       };
 
       ergon = {
-        account = metaLib.users.ergon;
+        account = metaLib.accounts.ergon;
         needsPassword = true;
-        homeImports = [
-          homeModules.workstation-base
-          homeModules.noctalia
-        ];
+        homeImports = ergonHomeImports;
       };
     };
 
     imports = [
-      nixosModules.workstation-base
-      nixosModules.qbittorrent-client
+      nixosModules.workstation-host
       nixosModules.steam
       ./_hardware.nix
     ]

modules/hosts/zenith/default.nix

@@ -7,6 +7,14 @@ let
   nixosModules = config.flake.modules.nixos;
   homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
+  workstationHomeImports = [ homeModules.workstation-base ];
+  portableNoctalia = homeModules.noctalia-portable;
+  kiriHomeImports = workstationHomeImports ++ [
+    homeModules.syncthing
+    homeModules.qbittorrent-client
+    portableNoctalia
+  ];
+  ergonHomeImports = workstationHomeImports ++ [ portableNoctalia ];
 in
 {
   flake.modules.nixos.zenith = metaLib.mkHost {
@@ -39,29 +47,20 @@ in
 
     users = {
       kiri = {
-        account = metaLib.users.kiri;
+        account = metaLib.accounts.kiri;
         needsPassword = true;
-        homeImports = [
-          homeModules.workstation-base
-          homeModules.syncthing
-          homeModules.qbittorrent-client
-          homeModules.noctalia-portable
-        ];
+        homeImports = kiriHomeImports;
       };
 
       ergon = {
-        account = metaLib.users.ergon;
+        account = metaLib.accounts.ergon;
         needsPassword = true;
-        homeImports = [
-          homeModules.workstation-base
-          homeModules.noctalia-portable
-        ];
+        homeImports = ergonHomeImports;
       };
     };
 
     imports = [
-      nixosModules.workstation-base
-      nixosModules.qbittorrent-client
+      nixosModules.workstation-host
       nixosModules.laptop-power
       {
         hardware.enableRedistributableFirmware = true;