From 8566c74925ad4595cc6f35c18b539e4b71ba3ac9 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Thu, 2 Jul 2026 10:54:55 +0200
Subject: [PATCH] Dissalow clanker commits

---
 modules/cli/home.nix     | 6 ++++++
 modules/cli/zsh/init.zsh | 1 +
 2 files changed, 7 insertions(+)

diff --git a/modules/cli/home.nix b/modules/cli/home.nix
index 742b353..2d108d5 100644
--- a/modules/cli/home.nix
+++ b/modules/cli/home.nix
@@ -88,6 +88,12 @@
     ${lib.getExe pkgs.jq} '.remoteControlAtStartup = true' "$f" >"$f.tmp" && mv "$f.tmp" "$f"
   '';
 
+  xdg.configFile."claude/CLAUDE.md".text = ''
+    # Global instructions
+
+    - NEVER EVER commit. Do not run `git commit` (or `jj commit`) and never push changes under any circumstances unless the user explicitly asks you to commit in that message.
+  '';
+
   xdg.configFile."claude/keybindings.json".text = builtins.toJSON {
     "$schema" = "https://www.schemastore.org/claude-code-keybindings.json";
     "$docs" = "https://code.claude.com/docs/en/keybindings";
diff --git a/modules/cli/zsh/init.zsh b/modules/cli/zsh/init.zsh
index 5f0f7be..4506a36 100644
--- a/modules/cli/zsh/init.zsh
+++ b/modules/cli/zsh/init.zsh
@@ -109,6 +109,7 @@ EOF
 	fi
 
 	local rev="${2:-@-}"
+	jj git fetch
 	jj rebase -o 'trunk()' -s "$rev"
 	jj git push --named "$1=$rev"
 }