From 8d517f02482615136f12507fd2c76d73743dd616 Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@nullring.xyz>
Date: Thu, 5 Mar 2026 16:46:04 -0800
Subject: fix hooks

---
 config/nix.org | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'config/nix.org')

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}" = {
-- 
cgit v1.3