Merge branch 'chore/fix-hooks'

3 files changed, 6 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}" = {
diff --git a/flake.nix b/flake.nix
index c2d5703..603c15a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -197,6 +197,7 @@ cp -r $HOME/website_html/. $out/
           shellHook = ''
 ${pre-commit-check.shellHook}
 git config branch.main.mergeoptions "--no-ff"
+alias gprune='git branch --merged | grep -v -E "^\*|main|master|dev" | xargs -r git branch -d'
 '';
           buildInputs = [
             deadnix
diff --git a/nix b/nix
-Subproject 1a370532584a0bb69b043d52cde9ef53699a2ec
+Subproject 6f08e9d393e7c6cf3bfae4374e244bc84e2cb0b