default.nix

@@ -9,9 +9,7 @@ let
   pre-commit-check =
     (import "${git-hooks}/nix" {
       inherit nixpkgs system;
-      gitignore-nix-src = {
-        lib = import gitignore { inherit lib; };
-      };
+      gitignore-nix-src = gitignore;
     }).run
       {
         src = ./.;
@@ -20,7 +18,7 @@ let
             ## Add a directory here if pre-commit hooks shouldn't apply to it.
             optout = [
               "npins"
-              ".terraform"
+              "**/.terraform"
             ];
             excludes = map (dir: "^${dir}/") optout;
             addExcludes = lib.mapAttrs (_: c: c // { inherit excludes; });
@@ -38,9 +36,6 @@ in
   shell = pkgs.mkShellNoCC {
     inherit (pre-commit-check) shellHook;
     buildInputs = pre-commit-check.enabledPackages;
-    packages = [
-      pkgs.nixfmt-rfc-style
-    ];
   };
 
   tests = {

infra/TODO.md

@@ -13,5 +13,7 @@ refactor:
 
 test:
 - services tests
+- root test
+- root hook
 - secret shell
 - ci

services/default.nix

@@ -5,10 +5,11 @@
     inherit system;
   },
 }:
-{
-  tests = {
-    mastodon = import ./tests/mastodon.nix { inherit pkgs; };
-    pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs; };
-    peertube = import ./tests/peertube.nix { inherit pkgs; };
-  };
+let
+  inherit (pkgs) lib;
+in
+lib.mapAttrs (name: test: pkgs.testers.runNixOSTest (test // { inherit name; })) {
+  mastodon = import ./tests/mastodon.nix { inherit pkgs; };
+  pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs; };
+  peertube = import ./tests/peertube.nix { inherit pkgs; };
 }