From ab6ca4b23eaed93648abc7b62d606c8ceae1d66d Mon Sep 17 00:00:00 2001
From: Lachlan Donald <lachlan@ljd.cc>
Date: Wed, 15 Oct 2025 08:44:25 +1100
Subject: [PATCH 1/3] feat: add task runner with zsh completion

---
 Brewfile            | 4 ++++
 task/completion.zsh | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 task/completion.zsh

diff --git a/Brewfile b/Brewfile
index 7d9b689..9417f8f 100644
--- a/Brewfile
+++ b/Brewfile
@@ -17,6 +17,10 @@ brew 'starship'
 brew 'kubetail'
 brew 'kubecolor'
 
+# task runner
+tap 'go-task/tap'
+brew 'go-task/tap/go-task'
+
 brew 'awscli'
 brew 'pv'
 brew 'wget'
diff --git a/task/completion.zsh b/task/completion.zsh
new file mode 100644
index 0000000..c23f140
--- /dev/null
+++ b/task/completion.zsh
@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+
+# task completion - loads after compinit
+# Works with hermit-managed task installations
+if command -v task >/dev/null 2>&1; then
+  eval "$(task --completion zsh 2>/dev/null)"
+fi

From 2987178eba537604a544fe6e86896718175da2a1 Mon Sep 17 00:00:00 2001
From: Lachlan Donald <lachlan@ljd.cc>
Date: Wed, 15 Oct 2025 08:44:26 +1100
Subject: [PATCH 2/3] fix: make sync-fork alias work with non-main branches

The sync-fork alias now auto-detects the upstream default branch
(main, master, etc.) instead of hardcoding 'main'.

Also removes gpgsign and git-lfs config that are no longer needed.
---
 git/gitconfig.symlink | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index fd3aa0e..d8c70b3 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -12,7 +12,6 @@
 
 [commit]
   verbose = true
-  gpgsign = true
 
 [fetch]
   prune = true
@@ -45,7 +44,7 @@
   track = "!git branch --set-upstream-to=origin/$(git symbolic-ref --short HEAD)"
   wip = "!git add . && git commit -a --no-verify -m WIP"
   b = "!bt() { git checkout -b lox/$(date +%Y-%m-%d)-$1;}; bt"
-  sync-fork = "!git fetch upstream && git push origin upstream/main:main"
+  sync-fork = "!f() { git fetch upstream && git remote set-head upstream --auto && branch=$(git symbolic-ref refs/remotes/upstream/HEAD | sed 's@^refs/remotes/upstream/@@') && git push origin upstream/$branch:$branch; }; f"
 
 [rerere]
   enabled = 1
@@ -59,9 +58,3 @@
 
 [gpg "ssh"]
   program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
-
-[filter "lfs"]
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
-  clean = git-lfs clean -- %f

From a62b0d2c2d994835d87f7ea92eefd09365acd205 Mon Sep 17 00:00:00 2001
From: Lachlan Donald <lachlan@ljd.cc>
Date: Wed, 15 Oct 2025 09:28:13 +1100
Subject: [PATCH 3/3] chore: clean up ampcode configuration

- Remove playwright MCP server config
- Remove gpt5 setting
- Disable git coauthor and amp thread features
- Add .amp/ directory to gitignore
---
 git/gitignore.symlink |  1 +
 vscode/settings.json  | 17 +++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/git/gitignore.symlink b/git/gitignore.symlink
index d6ba0d3..78b5bd9 100644
--- a/git/gitignore.symlink
+++ b/git/gitignore.symlink
@@ -18,3 +18,4 @@ CLAUDE.local.md
 .wtp.yml
 /AGENT.md
 /.codex/
+/.amp/
diff --git a/vscode/settings.json b/vscode/settings.json
index 85ecd11..3c370a1 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -117,18 +117,11 @@
   "amp.url": "https://ampcode.com/",
   "amp.tab.enabled": true,
   "amp.dangerouslyAllowAll": true,
-  "amp.gpt5": true,
-  "amp.mcpServers": {
-    "playwright": {
-      "command": "npx",
-      "args": [
-        "-y",
-        "@playwright/mcp@latest",
-        "--headless",
-        "--isolated"
-      ]
-    }
-  },
+  "amp.mcpServers": {},
+  "amp.git.commit.coauthor.enabled": false,
+  "amp.git.commit.ampThread.enabled": false,
+
+
   "[dockercompose]": {
     "editor.insertSpaces": true,
     "editor.tabSize": 2,