refactor: orion and base

modules/hosts/orion/default.nix

@@ -1,31 +1,41 @@
 {
   inputs,
   config,
+  lib,
   ...
 }:
 let
   nixosModules = config.flake.modules.nixos;
-  homeModules = config.flake.modules.homeManager;
-  metaLib = config.meta.lib;
+  hmModules = config.flake.modules.homeManager;
 in
 {
-  flake.modules.nixos.orion-admin =
+  repo.machines.orion = {
+    buildFunction = config.repo.helpers.mkHost;
+    module = nixosModules.orion;
+
+    accounts = lib.getAttrs [ "kiri" ] config.repo.accounts;
+
+    stateVersion = "24.05";
+    hmStateVersion = "24.05";
+  };
+
+  flake.modules.nixos.orion =
+    { ... }:
     {
-      config,
-      lib,
-      pkgs,
-      ...
-    }:
-    let
-      terminal = metaLib.resolveRepoTerminal {
-        inherit pkgs;
-      };
-    in
-    {
-      assertions = metaLib.mkTerminalAssertions {
-        inherit terminal;
-        requireTerminfo = true;
-      };
+      imports = [
+        nixosModules.host-base
+        nixosModules.sops-host-ssh-key
+        nixosModules.openssh
+        nixosModules.caddy
+        nixosModules.server-firewall
+        nixosModules.ssh-agent-auth
+        nixosModules.vaultwarden
+        nixosModules.radicale
+        nixosModules.actual
+        nixosModules.gitea
+        ./_hardware.nix
+        ./_disk.nix
+      ];
 
       users.users.kiri = {
         linger = true;
@@ -33,39 +43,5 @@ in
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAU2LydkXRTtNFY7oyX8JQURwXLVhB71DeK8XzrXeFX1 openpgp:0xA490D93A"
         ];
       };
-
-      environment.systemPackages = [
-      ]
-      ++ lib.optional terminal.hasTerminfo (lib.getOutput "terminfo" terminal.package);
     };
-
-  flake.modules.nixos.orion = metaLib.mkHost {
-    name = "orion";
-    users = {
-      kiri = {
-        account = metaLib.accounts.kiri;
-        homeImports = [
-          homeModules.shell
-          homeModules.git
-          homeModules.syncthing
-        ];
-      };
-    };
-
-    imports = [
-      nixosModules.host-base
-      nixosModules.sops-host-ssh-key
-      nixosModules.openssh
-      nixosModules.caddy
-      nixosModules.server-firewall
-      nixosModules.ssh-agent-auth
-      nixosModules.orion-admin
-      nixosModules.vaultwarden
-      nixosModules.radicale
-      nixosModules.actual
-      nixosModules.gitea
-      ./_hardware.nix
-      ./_disk.nix
-    ];
-  };
 }