fix hooks

1 files changed, 5 insertions, 2 deletions

diff --git a/config/nix.org b/config/nix.org
index 71f7d36..996d35c 100644
--- a/config/nix.org
+++ b/config/nix.org
@@ -189,7 +189,7 @@ and now for the main flake:
               enable = true;
               name = "${hostname}-vm-build";
               description = "Ensure ${hostname} can build";
-              stages = [ "post-merge" ];
+              stages = [ "pre-merge-commit" ];
               entry = "${pkgs.writeShellScript "${hostname}-check" ''
   #!/usr/bin/env bash
   set -e
@@ -339,7 +339,10 @@ and now for the main flake:
                 statix
                 deadnix
               ];
-              inherit (pre-commit-check) shellHook;
+              shellHook = ''
+  ${pre-commit-check.shellHook}
+  git config branch.main.mergeoptions "--no-ff"
+  '';
             };
 
             packages."${system}" = {