From 04c1be5694b82178ce956645cc6c9f22731e61cb Mon Sep 17 00:00:00 2001
From: Matthew Ryan Dillon <matthew@akdillon.net>
Date: Sun, 10 Aug 2025 20:06:37 -0400
Subject: [PATCH] more misc edits

---
 home/bin/executable_checkout-workspace.sh   |  71 +++++++++++
 home/dot_aider.conf.yml.tmpl                |   2 -
 home/dot_zshrc.tmpl                         |   3 +
 home/encrypted_dot_zshklaviyo.age           | 131 ++++++++++----------
 home/private_dot_config/jj/config.toml.tmpl |   7 +-
 5 files changed, 146 insertions(+), 68 deletions(-)
 create mode 100644 home/bin/executable_checkout-workspace.sh

diff --git a/home/bin/executable_checkout-workspace.sh b/home/bin/executable_checkout-workspace.sh
new file mode 100644
index 0000000..e053de0
--- /dev/null
+++ b/home/bin/executable_checkout-workspace.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+if [[ "$1" == "--help" || "$1" == "-h" ]]; then
+    echo "usage: $0 <repo_name> <branch_name>"
+    echo "example: $0 k-repo foo-branch1"
+    exit 0
+fi
+
+if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+    echo "error: invalid number of arguments"
+    echo "usage: $0 <repo_name> <branch_name>"
+    echo "run with --help for more information"
+    exit 1
+fi
+
+REPO_NAME="$1"
+BRANCH_NAME="$2"
+
+REPO_PATH="$HOME/Klaviyo/Repos/$REPO_NAME"
+
+if [ ! -d "$REPO_PATH" ]; then
+    echo "error: repository directory does not exist: $REPO_PATH"
+    exit 1
+fi
+
+cd "$REPO_PATH" || exit 1
+
+if [ $# -eq 1 ]; then
+    echo "no branch name provided. listing github prs..."
+    
+    PR_LIST=$(gh pr list --limit 300 --json number,title,headRefName \
+        --template '{{range .}}{{.number}} | {{.title}} |{{.headRefName}}{{"\n"}}{{end}}')
+    
+    if [ -z "$PR_LIST" ]; then
+        echo "error: failed to fetch pr list from github"
+        exit 1
+    fi
+    
+    SELECTED_PR=$(echo "$PR_LIST" | fzf --delimiter='|' --with-nth=1,2 --prompt='pick a github pr > ' | awk -F'|' '{print $3}')
+    
+    if [ -z "$SELECTED_PR" ]; then
+        echo "no pr selected"
+        exit 1
+    fi
+    
+    BRANCH_NAME="$SELECTED_PR"
+fi
+
+# Escape branch name for filesystem use
+SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's/\//_/g' | sed 's/+/-/g')
+
+PR_NUMBER=""
+if [ -n "$BRANCH_NAME" ]; then
+    PR_NUMBER=$(echo "$PR_LIST" | grep "|.*$BRANCH_NAME$" | awk -F'|' '{print $1}' | head -1 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+fi
+
+jj git fetch || exit 1
+PARENT_DIR="$HOME/projects/work/reviews/$REPO_NAME"
+mkdir -p "$PARENT_DIR" || exit 1
+
+if [ -n "$PR_NUMBER" ]; then
+    WORKSPACE_DIR="$PARENT_DIR/${PR_NUMBER}_${SAFE_BRANCH_NAME}"
+else
+    WORKSPACE_DIR="$PARENT_DIR/$SAFE_BRANCH_NAME"
+fi
+
+jj workspace add "$WORKSPACE_DIR" -r "$BRANCH_NAME@origin" || exit 1
+echo "successfully created workspace for $REPO_NAME/$BRANCH_NAME"
+
+prr get "klaviyo/$REPO_NAME/$PR_NUMBER"
+echo "cd $WORKSPACE_DIR && prr edit klaviyo/$REPO_NAME/$PR_NUMBER"
diff --git a/home/dot_aider.conf.yml.tmpl b/home/dot_aider.conf.yml.tmpl
index 20d881e..8f88d8f 100644
--- a/home/dot_aider.conf.yml.tmpl
+++ b/home/dot_aider.conf.yml.tmpl
@@ -1,5 +1,3 @@
-model: openai/qwen/qwen3-coder-30b
-
 cache-prompts: true
 gitignore: false
 auto-commits: false
diff --git a/home/dot_zshrc.tmpl b/home/dot_zshrc.tmpl
index 48a0dc3..7182ed7 100644
--- a/home/dot_zshrc.tmpl
+++ b/home/dot_zshrc.tmpl
@@ -97,3 +97,6 @@ find_note() {
 
     git log --oneline -G"$1"
 }
+
+alias aider-gh="aider --openai-api-base $GH_OPENAI_BASE_URL --openai-api-key $GH_OPENAI_API_KEY --model $GH_OPENAI_MODEL --no-git"
+alias aider-lms="aider --openai-api-base $LMS_OPENAI_BASE_URL --openai-api-key $LMS_OPENAI_API_KEY --model openai/$LMS_OPENAI_MODEL --no-git"
diff --git a/home/encrypted_dot_zshklaviyo.age b/home/encrypted_dot_zshklaviyo.age
index 55ee961..c6b477f 100644
--- a/home/encrypted_dot_zshklaviyo.age
+++ b/home/encrypted_dot_zshklaviyo.age
@@ -1,67 +1,68 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzL2g5bzBjazh0Y2MvRDdS
-K0t2OWU2bGthSjlCblNqR1RMNXV2eklHVVZNCmpDK3JVbUZCQVB0VW0raVZ4RGg0
-TTlTSTZtSE1yclh4ckV0WEtrSTlSR3cKLS0tIFU1ZHAxeXpJUThFKzBjaXIyMDlv
-YW91R1AwSGpwOWRaSDZXV0tpQVluV28KhDmPr7xNjpnj5RCaqRaTADnDMgRu1m24
-ICPPHc6QhnorBTcSWn9jtWjzfo1P05qLDXhS79asy+h3GOStAnHQ/eyKvVcH6Shk
-XEzqynmKjxqou4N/d4B6ch0Rt0ZSZqB32GuTyatr9VUzrt6dAGcuJPV2KyKYERW2
-vyev3gPgtl3ayGlPxZRsHUtTZnY0JuW1jH7P6DqPg3ULtl+SDOLECI7qUqH6q0fr
-SHaOIE3F/lKX+SZPxmOPOyi40vOl7ANmdUdTRNyNL7u6elYg1y5LDZm4SIPMfubl
-+jrO82jiIeIKf3DeZO2neMGvTOaU8WCnU3GGLzs82l1mMFSv4yP8OvEsNEhJdV0e
-9mX8Vopn4Y6DNmvM/gwuMJMNaM/Mz2gOOvA3JnQfhoLZbkEiBu6LbMeG4fGv81r7
-ly6Xocn6Wo7mvcA4J8bTcEWAcCdgtXOCoEPnvM7ZYrWwo6DNXFdRseo3iV62wK96
-T0S+l6H0qw/qos8gSlsIboSzQpFLOQuc8jSYiqR1PSRRRWzhKtVrJU8SefD8DRGn
-OIbgmvYK92EOXUIIDA+RcBU1Y793ggFuXbWLwrm0sEWxqi9mtkPVDClIHUKgWOhV
-sqpluLH50VOc5BCP0U9CFuvjVBmrPVIUQS/JMStr7u3SE+N7CjJdVKR0zmmshzez
-XQ544BSUGl/15D4MI3/hPRJW7cxCGwNT0AdJ+1yLt7pBo5UC5fvUqPnhoOYKnx9+
-pDrNCho11ZJmMaqZTDQ3XR2njPDchqCj5Snnjo6EXI3ISalimWq2tSZQ0mHdiiR1
-1KTzW2DxPSgcSADKuwI0LbbpAxs/+aLP0xB4jMgI83zOmPNRdkTwMikqF64yD73y
-6yX4Zha+L7A+VskVSJK3vKNas9fEUve0ZrMRRdXXOfi4pbcEHwPVycDsbeUkJ7Sf
-Poy0QEHiSD/m10ANLimWt3TJSZ2GxW7UcxqWm+zoctruxajCl47OGaSZeAMBLxRY
-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
-x+Te
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXYStFaTYyL2M1RXh2OE5I
+Z2JybzEwaVVJWEI0K1dtVDZ3WUhERzVjTnpVCllZaUFFNm54eXdaRmJLWEZyVlU3
+ZHk4cm5CNlRpSmpxYUp6Y3JTRk5WdXcKLS0tIGduM25PK2xqbVU4Y0pwRlROTDNP
+NXhLbm9KS0kyS0VuSUtac2tTNDRYTFkK22J++I9ub9KWPFrNB+PNVKraeZy9qbbi
+25IEwMyj4aFptQ00Pan+T74+gDkpfE/0afPeTpbOmoXLWw3VNkSK6QtWv7nI2ctK
+20xgJaV2hQUisxVRbgMim10pA79MaE9SG96i/67HHBsnb74jVjH8sU/YlsG/n7DS
+fwN04HxZDiAT21Ybk/qp8jbwiVLQLpdLktwTOYXLpcWK3BDiVXYBZANqloLEPw49
+NkNYebahj5sBV52L/gcVz2le5GTuTg0N+oKX3DPCta7Y2uD7oq1dZMw1SGsyazHe
+EYF7/IvI66noqWLlLRaETKdLsbAQGrrzBWb+vyeu8tM1LXGDBKhEXVllF9komMv0
+gHnXbY3OFg9kNiKi3gA8+TfHPzMgHAEWNKj1Bftrq3xl0RJMeIfCWiU4eylRvibi
+3lice6ls9tGU+ufEIGkcIQZ3mrrQW0tPLUO4RefKMz+KB3Pn74nW9gaAMgVHhB5l
+y3UUbvKe1oLiyc0jYs3vyjQk/2dwl2Thj7b7GqGe81vfxDDGdWvFvqZvazV2UHkN
+lPPPYtrFTpm6Uv2lrVnljF7A0j0KYKzMkrFrgPtZFVqpfRhQQahIoKMemNqCohAY
+9abtTe/OBY7SuDYrXVOknVLqCZNWUarfLlmnBTpdYdUCGZQLEK4FTrQ6Tm643CqI
+t5si5L1r8RaaL1VLB9Os+LViqZJI/q3UYJrclv1SpOtKhMYfHGh2CzAGwC4kgWn/
+AbTAUxUIqE715D4yqlwAyBF3snsYLffQ6WAX6LjWZQJ6ITB4RZSkSQJiHvR1EbFc
+OVSsZt3UOOCy9I/tKxHG5dRCNMgAApX12SUg1zvCtvS7EojFcgPS7M+ONJJJ6yNH
+BFy2S/p+G+F46aiq45YOdDlM3+ZKrwK/jGJ131BJ7oMaohiMbH8XQPJ0HgmEWZbb
+Z0w7IApBstQeKbDdKIc361TBGQ+tC5ful9SZsrjbarBON+Nq8jys0T9iX1j6nb0l
+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
+C5eDpMEGZt4Mq2ny1/E=
 -----END AGE ENCRYPTED FILE-----
diff --git a/home/private_dot_config/jj/config.toml.tmpl b/home/private_dot_config/jj/config.toml.tmpl
index 737c147..03b599f 100644
--- a/home/private_dot_config/jj/config.toml.tmpl
+++ b/home/private_dot_config/jj/config.toml.tmpl
@@ -13,9 +13,14 @@ git_push_bookmark = '"{{ .github_personal }}_jj_" ++ change_id.short()'
 "diff added token" = { fg = "green", underline = false }
 
 [revset-aliases]
-"stack()" = "trunk()..@"
 "immutable_heads()" = "builtin_immutable_heads() | (trunk().. & ~mine())"
 
+[aliases]
+l = ["log", "-r", "(trunk()..@):: | (trunk()..@)-"]
+refresh = ["rebase", "-s", "roots(trunk()..@)", "-d", "trunk()"]
+insert = ["rebase", "-r", "@", "--before", "merge", "--after", "trunk()"]
+bdiff = ["diff", "-r", "(trunk()..@)::"]
+
 [ui]
 default-command = ["log"]
 diff-formatter = ":git"