admin: migrate to clan.nixosTests module

clanServices/admin/flake-module.nix

@@ -1,17 +1,18 @@
-{ lib, self, ... }:
+{ lib, ... }:
+let
+  module = lib.modules.importApply ./default.nix { };
+in
 {
   clan.modules = {
-    admin = lib.modules.importApply ./default.nix { };
+    admin = module;
   };
   perSystem =
-    { pkgs, ... }:
+    { ... }:
     {
-      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+      clan.nixosTests.admin = {
-        admin = import ./tests/vm/default.nix {
+        imports = [ ./tests/vm/default.nix ];
-          inherit pkgs;
+
-          clan-core = self;
+        clan.modules."@clan/admin" = module;
-          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
-        };
       };
     };
 }

clanServices/admin/tests/vm/default.nix

@@ -1,27 +1,11 @@
-{
-  pkgs,
-  nixosLib,
-  clan-core,
-  ...
-}:
-
 let
   public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII6zj7ubTg6z/aDwRNwvM/WlQdUocMprQ8E92NWxl6t+ test@test";
 in
-nixosLib.runTest (
-  { ... }:
 {
-    imports = [
-      clan-core.modules.nixosVmTest.clanTest
-    ];
-
-    hostPkgs = pkgs;
-
   name = "admin";
 
   clan = {
     directory = ./.;
-      modules."@clan/admin" = ../../default.nix;
     inventory = {
 
       machines.client = { };
@@ -59,4 +43,3 @@ nixosLib.runTest (
     client.succeed(f"ssh -F /dev/null -i /etc/private-test-key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes root@server true &>/dev/null")
   '';
 }
-)