Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 1 addition & 8 deletions git/gitconfig.symlink
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

[commit]
verbose = true
gpgsign = true

[fetch]
prune = true
Expand Down Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions git/gitignore.symlink
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ CLAUDE.local.md
.wtp.yml
/AGENT.md
/.codex/
/.amp/
7 changes: 7 additions & 0 deletions task/completion.zsh
Original file line number Diff line number Diff line change
@@ -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
17 changes: 5 additions & 12 deletions vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down