Compare commits
1 Commits
bead/nixos
...
feat/prebu
| Author | SHA1 | Date | |
|---|---|---|---|
| 4a450a216b |
0
.beads/sync_base.jsonl
Normal file
0
.beads/sync_base.jsonl
Normal file
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,2 @@
|
||||
result
|
||||
thoughts
|
||||
.beads
|
||||
|
||||
@@ -230,11 +230,7 @@
|
||||
system = "x86_64-linux";
|
||||
modules = nixosModules ++ [
|
||||
./machines/john-endesktop/configuration.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.users.johno = import ./home/home-server.nix;
|
||||
home-manager.extraSpecialArgs = { inherit system; };
|
||||
}
|
||||
# Minimal server - no home-manager needed
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
kubectl.enable = true;
|
||||
tmux.enable = true;
|
||||
plasma-manager.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
|
||||
targets.genericLinux.enable = true;
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
plasma-manager.enable = true;
|
||||
emacs.enable = true;
|
||||
i3_sway.enable = true;
|
||||
starship.enable = true;
|
||||
|
||||
# Launcher wrappers for excluded/optional packages
|
||||
launchers = {
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
prebuiltDoom = true;
|
||||
};
|
||||
i3_sway.enable = true;
|
||||
starship.enable = true;
|
||||
# development.enable = false; # Not needed for live USB
|
||||
# communication.enable = false; # Not needed for live USB
|
||||
# office.enable = false; # Not needed for live USB
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
plasma-manager.enable = true;
|
||||
emacs.enable = true;
|
||||
i3_sway.enable = true;
|
||||
starship.enable = true;
|
||||
# office.enable = false; # Not needed for media center
|
||||
# sync.enable = false; # Shared machine, no personal file sync
|
||||
};
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
{ pkgs, globalInputs, system, ... }:
|
||||
|
||||
{
|
||||
# Home Manager configuration for servers (minimal with development tools)
|
||||
home.username = "johno";
|
||||
home.homeDirectory = "/home/johno";
|
||||
home.stateVersion = "24.05";
|
||||
|
||||
# Minimal roles for server with development capability
|
||||
home.roles = {
|
||||
base.enable = true;
|
||||
development.enable = true;
|
||||
emacs.enable = true;
|
||||
starship.enable = true;
|
||||
tmux.enable = true;
|
||||
};
|
||||
|
||||
targets.genericLinux.enable = true;
|
||||
home.sessionVariables = {};
|
||||
home.sessionPath = [];
|
||||
|
||||
imports = [
|
||||
./roles
|
||||
./roles/base-linux
|
||||
];
|
||||
}
|
||||
@@ -19,6 +19,5 @@
|
||||
./sync
|
||||
./tmux
|
||||
./emacs
|
||||
./starship
|
||||
];
|
||||
}
|
||||
|
||||
@@ -85,25 +85,11 @@ in
|
||||
fi
|
||||
done
|
||||
|
||||
# Copy local skills from this repo (with retry for race conditions with running Claude)
|
||||
for file in ${./skills}/*.md; do
|
||||
if [ -f "$file" ]; then
|
||||
filename=$(basename "$file" .md)
|
||||
dest="$HOME/.claude/commands/''${filename}.md"
|
||||
# Remove existing file first, then copy with retry on failure
|
||||
rm -f "$dest" 2>/dev/null || true
|
||||
if ! cp "$file" "$dest" 2>/dev/null; then
|
||||
sleep 0.5
|
||||
cp "$file" "$dest" || echo "Warning: Failed to copy $filename.md to commands"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
$DRY_RUN_CMD echo "Claude Code humanlayer commands and agents installed successfully${
|
||||
if cfg.allowArbitraryClaudeCodeModelSelection
|
||||
then " (model specifications preserved)"
|
||||
else " (model selection removed)"
|
||||
} + local skills"
|
||||
}"
|
||||
'';
|
||||
|
||||
# Set up beads Claude Code integration (hooks for SessionStart/PreCompact)
|
||||
|
||||
@@ -1,244 +0,0 @@
|
||||
---
|
||||
description: Manage and respond to Gitea/Forgejo PR review comments
|
||||
---
|
||||
|
||||
# Gitea PR Review Comments
|
||||
|
||||
This skill enables reading PR review comments and posting inline thread replies on Gitea/Forgejo instances.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- `tea` CLI configured with a Gitea/Forgejo instance
|
||||
- Access token from tea config: `~/.config/tea/config.yml`
|
||||
- Repository must be a Gitea/Forgejo remote (not GitHub)
|
||||
|
||||
## Configuration
|
||||
|
||||
Get the Gitea instance URL and token from tea config:
|
||||
|
||||
```bash
|
||||
# Get the default login URL and token
|
||||
yq -r '.logins[] | select(.name == "default") | .url' ~/.config/tea/config.yml
|
||||
yq -r '.logins[] | select(.name == "default") | .token' ~/.config/tea/config.yml
|
||||
```
|
||||
|
||||
Or if you have a specific login name:
|
||||
```bash
|
||||
yq -r '.logins[] | select(.name == "YOUR_LOGIN") | .url' ~/.config/tea/config.yml
|
||||
yq -r '.logins[] | select(.name == "YOUR_LOGIN") | .token' ~/.config/tea/config.yml
|
||||
```
|
||||
|
||||
## Commands
|
||||
|
||||
### 1. List PR Review Comments
|
||||
|
||||
Fetch all reviews and their comments for a PR:
|
||||
|
||||
```bash
|
||||
# Set environment variables
|
||||
GITEA_URL="https://git.johnogle.info"
|
||||
TOKEN="<your-token>"
|
||||
OWNER="<repo-owner>"
|
||||
REPO="<repo-name>"
|
||||
PR_NUMBER="<pr-number>"
|
||||
|
||||
# Get all reviews for the PR
|
||||
curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews" | jq
|
||||
|
||||
# Get comments for a specific review
|
||||
REVIEW_ID="<review-id>"
|
||||
curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews/$REVIEW_ID/comments" | jq
|
||||
```
|
||||
|
||||
### 2. View All Review Comments (Combined)
|
||||
|
||||
```bash
|
||||
# Get all reviews and their comments in one view
|
||||
curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews" | \
|
||||
jq -r '.[] | "Review \(.id) by \(.user.login): \(.state)\n Body: \(.body)"'
|
||||
|
||||
# For each review, show inline comments
|
||||
for REVIEW_ID in $(curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews" | jq -r '.[].id'); do
|
||||
echo "=== Review $REVIEW_ID comments ==="
|
||||
curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews/$REVIEW_ID/comments" | \
|
||||
jq -r '.[] | "[\(.path):\(.line)] \(.body)"'
|
||||
done
|
||||
```
|
||||
|
||||
### 3. Reply to Review Comments (Web Endpoint Method)
|
||||
|
||||
The Gitea REST API does not support replying to review comment threads. The web UI uses a different endpoint:
|
||||
|
||||
```
|
||||
POST /{owner}/{repo}/pulls/{pr_number}/files/reviews/comments
|
||||
Content-Type: multipart/form-data
|
||||
```
|
||||
|
||||
**Required form fields:**
|
||||
- `reply`: Review ID to reply to
|
||||
- `content`: The reply message
|
||||
- `path`: File path
|
||||
- `line`: Line number
|
||||
- `side`: `proposed` or `original`
|
||||
- `single_review`: `true`
|
||||
- `origin`: `timeline`
|
||||
- `_csrf`: CSRF token (required for web endpoint)
|
||||
|
||||
**Authentication Challenge:**
|
||||
This endpoint requires session-based authentication, not API tokens. Options:
|
||||
|
||||
#### Option A: Use Browser Session (Recommended)
|
||||
|
||||
1. Log in to Gitea in your browser
|
||||
2. Open browser developer tools and copy cookies
|
||||
3. Use the session cookies with curl
|
||||
|
||||
```bash
|
||||
# First, get CSRF token from the PR page
|
||||
CSRF=$(curl -s -c cookies.txt -b cookies.txt \
|
||||
"$GITEA_URL/$OWNER/$REPO/pulls/$PR_NUMBER/files" | \
|
||||
grep -oP 'name="_csrf" value="\K[^"]+')
|
||||
|
||||
# Post the reply
|
||||
curl -s -b cookies.txt \
|
||||
-F "reply=$REVIEW_ID" \
|
||||
-F "content=Your reply message here" \
|
||||
-F "path=$FILE_PATH" \
|
||||
-F "line=$LINE_NUMBER" \
|
||||
-F "side=proposed" \
|
||||
-F "single_review=true" \
|
||||
-F "origin=timeline" \
|
||||
-F "_csrf=$CSRF" \
|
||||
"$GITEA_URL/$OWNER/$REPO/pulls/$PR_NUMBER/files/reviews/comments"
|
||||
```
|
||||
|
||||
#### Option B: Create Top-Level Comment (Fallback)
|
||||
|
||||
If thread replies are not critical, use the API to create a top-level comment:
|
||||
|
||||
```bash
|
||||
# Create a top-level comment mentioning the review context
|
||||
curl -s -X POST \
|
||||
-H "Authorization: token $TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"body\": \"Re: @reviewer's comment on $FILE_PATH:$LINE_NUMBER\n\nYour reply here\"}" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/issues/$PR_NUMBER/comments"
|
||||
```
|
||||
|
||||
Or use tea CLI:
|
||||
```bash
|
||||
tea comment $PR_NUMBER "Re: @reviewer's comment on $FILE_PATH:$LINE_NUMBER
|
||||
|
||||
Your reply here"
|
||||
```
|
||||
|
||||
### 4. Submit a New Review
|
||||
|
||||
Create a new review with inline comments:
|
||||
|
||||
```bash
|
||||
curl -s -X POST \
|
||||
-H "Authorization: token $TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"body": "Overall review comments",
|
||||
"event": "COMMENT",
|
||||
"comments": [
|
||||
{
|
||||
"path": "path/to/file.py",
|
||||
"body": "Comment on this line",
|
||||
"new_position": 10
|
||||
}
|
||||
]
|
||||
}' \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews"
|
||||
```
|
||||
|
||||
Event types: `COMMENT`, `APPROVE`, `REQUEST_CHANGES`
|
||||
|
||||
## Workflow Example
|
||||
|
||||
### Reading and Responding to Reviews
|
||||
|
||||
1. **Set up environment**:
|
||||
```bash
|
||||
export GITEA_URL=$(yq -r '.logins[] | select(.name == "default") | .url' ~/.config/tea/config.yml)
|
||||
export TOKEN=$(yq -r '.logins[] | select(.name == "default") | .token' ~/.config/tea/config.yml)
|
||||
export OWNER="johno"
|
||||
export REPO="nixos-configs"
|
||||
export PR_NUMBER="5"
|
||||
```
|
||||
|
||||
2. **List all pending review comments**:
|
||||
```bash
|
||||
# Get reviews
|
||||
curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews" | \
|
||||
jq -r '.[] | select(.state == "REQUEST_CHANGES" or .state == "COMMENT") |
|
||||
"Review \(.id) by \(.user.login) (\(.state)):\n\(.body)\n"'
|
||||
```
|
||||
|
||||
3. **Get detailed comments for a review**:
|
||||
```bash
|
||||
REVIEW_ID="2"
|
||||
curl -s -H "Authorization: token $TOKEN" \
|
||||
"$GITEA_URL/api/v1/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews/$REVIEW_ID/comments" | \
|
||||
jq -r '.[] | "File: \(.path):\(.line)\nComment: \(.body)\nID: \(.id)\n---"'
|
||||
```
|
||||
|
||||
4. **Respond using top-level comment** (most reliable):
|
||||
```bash
|
||||
tea comment $PR_NUMBER "Addressing review feedback:
|
||||
|
||||
- File \`path/to/file.py\` line 10: Fixed the issue by...
|
||||
- File \`other/file.py\` line 25: Updated as suggested..."
|
||||
```
|
||||
|
||||
## API Reference
|
||||
|
||||
### Endpoints
|
||||
|
||||
| Action | Method | Endpoint |
|
||||
|--------|--------|----------|
|
||||
| List reviews | GET | `/api/v1/repos/{owner}/{repo}/pulls/{index}/reviews` |
|
||||
| Get review | GET | `/api/v1/repos/{owner}/{repo}/pulls/{index}/reviews/{id}` |
|
||||
| Get review comments | GET | `/api/v1/repos/{owner}/{repo}/pulls/{index}/reviews/{id}/comments` |
|
||||
| Create review | POST | `/api/v1/repos/{owner}/{repo}/pulls/{index}/reviews` |
|
||||
| Submit review | POST | `/api/v1/repos/{owner}/{repo}/pulls/{index}/reviews/{id}` |
|
||||
| Delete review | DELETE | `/api/v1/repos/{owner}/{repo}/pulls/{index}/reviews/{id}` |
|
||||
| Create issue comment | POST | `/api/v1/repos/{owner}/{repo}/issues/{index}/comments` |
|
||||
|
||||
### Review States
|
||||
|
||||
- `PENDING` - Draft review not yet submitted
|
||||
- `COMMENT` - General comment without approval/rejection
|
||||
- `APPROVE` - Approving the changes
|
||||
- `REQUEST_CHANGES` - Requesting changes before merge
|
||||
|
||||
## Limitations
|
||||
|
||||
1. **Thread replies**: The Gitea REST API does not support replying directly to review comment threads. This is a known limitation. Workarounds:
|
||||
- Use top-level comments with context
|
||||
- Use the web UI manually for thread replies
|
||||
- Implement session-based authentication to use the web endpoint
|
||||
|
||||
2. **CSRF tokens**: The web endpoint for thread replies requires CSRF tokens, which expire and need to be fetched from the page.
|
||||
|
||||
3. **Session auth**: API tokens work for REST API but not for web endpoints that require session cookies.
|
||||
|
||||
## Tips
|
||||
|
||||
- Always quote file paths and line numbers when responding via top-level comments
|
||||
- Use `tea pr view $PR_NUMBER --comments` to see all comments
|
||||
- Use `tea open pulls/$PR_NUMBER` to open the PR in browser for manual thread replies
|
||||
- Consider using `tea pr approve $PR_NUMBER` after addressing all comments
|
||||
|
||||
## See Also
|
||||
|
||||
- Gitea API Documentation: https://docs.gitea.com/api/1.20/
|
||||
- `tea` CLI: https://gitea.com/gitea/tea
|
||||
@@ -1,205 +0,0 @@
|
||||
---
|
||||
description: Orchestrate parallel bead processing with worktrees, PRs, and reviews
|
||||
---
|
||||
|
||||
# Parallel Beads Workflow
|
||||
|
||||
This skill orchestrates parallel bead processing using subagents. Each bead gets its own worktree, implementation, PR, and review.
|
||||
|
||||
## Phase 1: Selection
|
||||
|
||||
1. **Get ready beads**: Run `bd ready` to list all beads with no blockers
|
||||
2. **Present selection**: Use `AskUserQuestion` with `multiSelect: true` to let the user choose which beads to work on
|
||||
- Include bead ID and title for each option
|
||||
- Allow selection of multiple beads
|
||||
|
||||
Example:
|
||||
```
|
||||
AskUserQuestion with:
|
||||
- question: "Which beads do you want to work on in parallel?"
|
||||
- multiSelect: true
|
||||
- options from bd ready output
|
||||
```
|
||||
|
||||
## Phase 2: Parallel Implementation
|
||||
|
||||
For each selected bead, launch a subagent using the Task tool. All subagents should be launched in parallel (single message with multiple Task tool calls).
|
||||
|
||||
### Subagent Instructions Template
|
||||
|
||||
Each implementation subagent should receive these instructions:
|
||||
|
||||
```
|
||||
Work on bead [BEAD_ID]: [BEAD_TITLE]
|
||||
|
||||
1. **Create worktree**:
|
||||
- Branch name: `bead/[BEAD_ID]`
|
||||
- Worktree path: `~/wt/[REPO_NAME]/[BEAD_ID]`
|
||||
- Command: `git worktree add -b bead/[BEAD_ID] ~/wt/[REPO_NAME]/[BEAD_ID]`
|
||||
|
||||
2. **Review the bead requirements**:
|
||||
- Run `bd show [BEAD_ID]` to understand the acceptance criteria
|
||||
- Note any external issue references (GitHub issues, Linear tickets, etc.)
|
||||
|
||||
3. **Implement the changes**:
|
||||
- Work in the worktree directory
|
||||
- Complete all acceptance criteria listed in the bead
|
||||
- Run any relevant tests or checks
|
||||
|
||||
4. **Commit and push**:
|
||||
- Stage all changes: `git add -A`
|
||||
- Create a descriptive commit message
|
||||
- Push the branch: `git push -u origin bead/[BEAD_ID]`
|
||||
|
||||
5. **Create a PR**:
|
||||
- Detect hosting provider from origin URL: `git remote get-url origin`
|
||||
- If URL contains `github.com`, use `gh`; otherwise use `tea` (Gitea/Forgejo)
|
||||
- PR title: "[BEAD_ID] [BEAD_TITLE]"
|
||||
- PR body must include:
|
||||
- Reference to bead ID: "Implements bead: [BEAD_ID]"
|
||||
- Any external issue references from the bead (e.g., "Closes #123")
|
||||
- Summary of changes
|
||||
- For GitHub (`gh`):
|
||||
```bash
|
||||
gh pr create --title "[BEAD_ID] [BEAD_TITLE]" --body "$(cat <<'EOF'
|
||||
## Summary
|
||||
[Brief description of changes]
|
||||
|
||||
## Bead Reference
|
||||
Implements bead: [BEAD_ID]
|
||||
|
||||
## External Issues
|
||||
[Any linked issues from the bead]
|
||||
|
||||
## Changes
|
||||
- [List of changes made]
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
- For Gitea (`tea`):
|
||||
```bash
|
||||
tea pr create --head bead/[BEAD_ID] --base main \
|
||||
--title "[BEAD_ID] [BEAD_TITLE]" \
|
||||
--description "## Summary
|
||||
[Brief description of changes]
|
||||
|
||||
## Bead Reference
|
||||
Implements bead: [BEAD_ID]
|
||||
|
||||
## External Issues
|
||||
[Any linked issues from the bead]
|
||||
|
||||
## Changes
|
||||
- [List of changes made]"
|
||||
```
|
||||
|
||||
6. **Update bead status**:
|
||||
- Mark the bead as "in_review": `bd update [BEAD_ID] --status=in_review`
|
||||
- Add the PR URL to the bead notes: `bd update [BEAD_ID] --notes="$(bd show [BEAD_ID] --json | jq -r '.notes')
|
||||
|
||||
PR: [PR_URL]"`
|
||||
|
||||
7. **Report results**:
|
||||
- Return: PR URL, bead ID, success/failure status
|
||||
- If blocked or unable to complete, explain what's blocking progress
|
||||
```
|
||||
|
||||
### Launching Subagents
|
||||
|
||||
Use `subagent_type: "general-purpose"` for implementation subagents. Launch all selected beads' subagents in a single message for parallel execution:
|
||||
|
||||
```
|
||||
<Task calls for each selected bead - all in one message>
|
||||
```
|
||||
|
||||
Collect results from all subagents before proceeding.
|
||||
|
||||
## Phase 3: Parallel Review
|
||||
|
||||
After all implementation subagents complete, launch review subagents for each PR.
|
||||
|
||||
### Review Subagent Instructions Template
|
||||
|
||||
```
|
||||
Review PR for bead [BEAD_ID]
|
||||
|
||||
1. **Detect hosting provider**: Run `git remote get-url origin` - if it contains `github.com` use `gh`, otherwise use `tea`
|
||||
|
||||
2. **Read the PR**:
|
||||
- For GitHub: `gh pr view [PR_NUMBER] --json title,body,additions,deletions,files`
|
||||
- For Gitea: `tea pr view [PR_NUMBER]`
|
||||
- View the diff: `git diff main...bead/[BEAD_ID]`
|
||||
|
||||
3. **Review against acceptance criteria**:
|
||||
- Run `bd show [BEAD_ID]` to get the acceptance criteria
|
||||
- Verify each criterion is addressed
|
||||
|
||||
4. **Leave review comments**:
|
||||
- For GitHub: `gh pr review [PR_NUMBER] --comment --body "[COMMENTS]"`
|
||||
- For Gitea: `tea pr review [PR_NUMBER] --comment "[COMMENTS]"`
|
||||
- Include:
|
||||
- Acceptance criteria checklist (which are met, which might be missing)
|
||||
- Code quality observations
|
||||
- Suggestions for improvement
|
||||
|
||||
5. **Return summary**:
|
||||
- Overall assessment (ready to merge / needs changes)
|
||||
- Key findings
|
||||
```
|
||||
|
||||
Launch all review subagents in parallel.
|
||||
|
||||
## Phase 4: Cleanup and Summary
|
||||
|
||||
After reviews complete:
|
||||
|
||||
1. **Clean up worktrees**:
|
||||
```bash
|
||||
git worktree remove ~/wt/[REPO_NAME]/[BEAD_ID] --force
|
||||
```
|
||||
Do this for each bead's worktree.
|
||||
|
||||
2. **Provide final summary**:
|
||||
Present a table or list with:
|
||||
- Bead ID
|
||||
- PR URL
|
||||
- Status (success / failed / blocked)
|
||||
- Review summary
|
||||
- Any failures or blockers encountered
|
||||
|
||||
Example output:
|
||||
```
|
||||
## Parallel Beads Summary
|
||||
|
||||
| Bead | PR | Bead Status | Review |
|
||||
|------|-----|-------------|--------|
|
||||
| beads-abc | #123 | in_review | Approved |
|
||||
| beads-xyz | #124 | in_review | Needs changes |
|
||||
| beads-123 | - | open (failed) | Blocked by missing dependency |
|
||||
|
||||
### Failures/Blockers
|
||||
- beads-123: Could not complete because [reason]
|
||||
|
||||
### Next Steps
|
||||
- Review PRs that need changes
|
||||
- Address blockers for failed beads
|
||||
- Run `/reconcile_beads` after PRs are merged to close beads
|
||||
```
|
||||
|
||||
## Error Handling
|
||||
|
||||
- **Subagent failures**: If a subagent fails or times out, note it in the summary but continue with other beads
|
||||
- **PR creation failures**: Report the error but continue with reviews of successful PRs
|
||||
- **Worktree conflicts**: If a worktree already exists, ask the user if they want to remove it or skip that bead
|
||||
|
||||
## Resource Limits
|
||||
|
||||
- Consider limiting concurrent subagents to 3-5 to avoid overwhelming system resources
|
||||
- If user selects more beads than the limit, process them in batches
|
||||
|
||||
## Notes
|
||||
|
||||
- This workflow integrates with the beads system (`bd` commands)
|
||||
- Worktrees are created in `~/wt/[REPO_NAME]/` by convention
|
||||
- Each bead gets its own isolated branch and worktree
|
||||
- PRs automatically reference the bead ID for traceability
|
||||
@@ -1,88 +0,0 @@
|
||||
---
|
||||
description: Reconcile beads with merged PRs and close completed beads
|
||||
---
|
||||
|
||||
# Reconcile Beads Workflow
|
||||
|
||||
This skill reconciles beads that are in `in_review` status with their corresponding PRs. If a PR has been merged, the bead is closed.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- Custom status `in_review` must be configured: `bd config set status.custom "in_review"`
|
||||
- Beads in `in_review` status should have a PR URL in their notes
|
||||
|
||||
## Workflow
|
||||
|
||||
### Step 1: Find beads in review
|
||||
|
||||
```bash
|
||||
bd list --status=in_review
|
||||
```
|
||||
|
||||
### Step 2: For each bead, check PR status
|
||||
|
||||
1. **Get the PR URL from bead notes**:
|
||||
```bash
|
||||
bd show [BEAD_ID] --json | jq -r '.[0].notes'
|
||||
```
|
||||
Note: `bd show --json` returns an array, so use `.[0]` to access the first element.
|
||||
Extract the PR URL (look for lines starting with "PR:" or containing pull request URLs).
|
||||
Extract the PR number: `echo "$NOTES" | grep -oP '/pulls/\K\d+'`
|
||||
|
||||
2. **Detect hosting provider**:
|
||||
- Run `git remote get-url origin`
|
||||
- If URL contains `github.com`, use `gh`; otherwise use `tea` (Gitea/Forgejo)
|
||||
|
||||
3. **Check PR status**:
|
||||
- For GitHub:
|
||||
```bash
|
||||
gh pr view [PR_NUMBER] --json state,merged
|
||||
```
|
||||
- For Gitea:
|
||||
```bash
|
||||
tea pr list --state=closed
|
||||
```
|
||||
Look for the PR number in the INDEX column with STATE "merged".
|
||||
Note: `tea pr view [PR_NUMBER]` lists all PRs, not a specific one. Use `tea pr list --state=closed` and look for your PR number in the results.
|
||||
|
||||
### Step 3: Close merged beads
|
||||
|
||||
If the PR is merged:
|
||||
```bash
|
||||
bd close [BEAD_ID] --reason="PR merged: [PR_URL]"
|
||||
```
|
||||
|
||||
### Step 4: Report summary
|
||||
|
||||
Present results:
|
||||
|
||||
```
|
||||
## Beads Reconciliation Summary
|
||||
|
||||
### Closed (PR Merged)
|
||||
| Bead | PR | Title |
|
||||
|------|-----|-------|
|
||||
| beads-abc | #123 | Feature X |
|
||||
| beads-xyz | #456 | Bug fix Y |
|
||||
|
||||
### Still in Review
|
||||
| Bead | PR | Status | Title |
|
||||
|------|-----|--------|-------|
|
||||
| beads-def | #789 | Open | Feature Z |
|
||||
|
||||
### Issues Found
|
||||
- beads-ghi: No PR URL found in notes
|
||||
- beads-jkl: PR #999 not found (may have been deleted)
|
||||
```
|
||||
|
||||
## Error Handling
|
||||
|
||||
- **Missing PR URL**: Skip the bead and report it
|
||||
- **PR not found**: Report the error but continue with other beads
|
||||
- **API errors**: Report and continue
|
||||
|
||||
## Notes
|
||||
|
||||
- This skill complements `/parallel_beads` which sets beads to `in_review` status
|
||||
- Run this skill periodically or after merging PRs to keep beads in sync
|
||||
- Beads with closed (but not merged) PRs are not automatically closed - they may need rework
|
||||
@@ -1,72 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.home.roles.starship;
|
||||
in
|
||||
{
|
||||
options.home.roles.starship = {
|
||||
enable = mkEnableOption "starship cross-shell prompt";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
|
||||
settings = {
|
||||
add_newline = true;
|
||||
|
||||
character = {
|
||||
success_symbol = "[>](bold green)";
|
||||
error_symbol = "[x](bold red)";
|
||||
vimcmd_symbol = "[<](bold green)";
|
||||
};
|
||||
|
||||
directory = {
|
||||
truncation_length = 4;
|
||||
truncate_to_repo = true;
|
||||
};
|
||||
|
||||
git_branch = {
|
||||
symbol = "";
|
||||
format = "[$symbol$branch(:$remote_branch)]($style) ";
|
||||
};
|
||||
|
||||
git_status = {
|
||||
format = "([$all_status$ahead_behind]($style) )";
|
||||
};
|
||||
|
||||
nix_shell = {
|
||||
symbol = "";
|
||||
format = "[$symbol$state( \\($name\\))]($style) ";
|
||||
};
|
||||
|
||||
cmd_duration = {
|
||||
min_time = 2000;
|
||||
format = "[$duration]($style) ";
|
||||
};
|
||||
|
||||
# Disable modules that are noisy or rarely needed
|
||||
package.disabled = true;
|
||||
nodejs.disabled = true;
|
||||
python.disabled = true;
|
||||
ruby.disabled = true;
|
||||
java.disabled = true;
|
||||
golang.disabled = true;
|
||||
rust.disabled = true;
|
||||
php.disabled = true;
|
||||
lua.disabled = true;
|
||||
perl.disabled = true;
|
||||
terraform.disabled = true;
|
||||
kubernetes.disabled = true;
|
||||
docker_context.disabled = true;
|
||||
aws.disabled = true;
|
||||
gcloud.disabled = true;
|
||||
azure.disabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -170,7 +170,6 @@ This document outlines the plan to migrate the john-endesktop server from Arch L
|
||||
```bash
|
||||
blkid /dev/nvme0n1p5
|
||||
# Note the UUID for updating hardware-configuration.nix
|
||||
/dev/nvme0n1p5: LABEL="nixos" UUID="5f4ad025-bfab-4aed-a933-6638348059e5" UUID_SUB="4734d820-7b8a-4b7f-853a-026021c1d204" BLOCK_SIZE="4096" TYPE="btrfs" PARTLABEL="data" PARTUUID="9ea025df-cdb7-48fd-b5d4-37cd5d8588eb"
|
||||
```
|
||||
|
||||
8. **Copy your NixOS configuration to the server**
|
||||
@@ -389,11 +388,11 @@ After successful migration and 24-48 hours of stable operation:
|
||||
|
||||
Pre-migration:
|
||||
- [x] nvme0n1p5 removal from media pool complete
|
||||
- [x] Recent backup verified (< 24 hours)
|
||||
- [x] Maintenance window scheduled
|
||||
- [x] NixOS ISO downloaded
|
||||
- [x] Bootable USB created
|
||||
- [x] NixOS config builds successfully
|
||||
- [ ] Recent backup verified (< 24 hours)
|
||||
- [ ] Maintenance window scheduled
|
||||
- [ ] NixOS ISO downloaded
|
||||
- [ ] Bootable USB created
|
||||
- [ ] NixOS config builds successfully
|
||||
|
||||
During migration:
|
||||
- [ ] ZFS pools exported
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
# Common configuration shared between NixOS and Darwin
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config = {
|
||||
time.timeZone = "America/Los_Angeles";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
glances
|
||||
pciutils
|
||||
tree
|
||||
usbutils
|
||||
vim
|
||||
];
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
max-jobs = "auto";
|
||||
trusted-users = [ "johno" ];
|
||||
substituters = [
|
||||
];
|
||||
};
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 10d";
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
};
|
||||
}
|
||||
@@ -7,10 +7,6 @@ let
|
||||
setEnvironmentPath = "${config.system.build.setEnvironment}";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./common.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
# Salt manages /etc/bashrc, /etc/zshrc, /etc/zshenv
|
||||
# nix-darwin writes to .local variants for nix-specific configuration
|
||||
@@ -47,6 +43,8 @@ in
|
||||
fi
|
||||
'';
|
||||
|
||||
time.timeZone = "America/Los_Angeles";
|
||||
|
||||
# System preferences
|
||||
system.defaults = {
|
||||
# Custom keyboard shortcuts
|
||||
@@ -81,5 +79,42 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
glances
|
||||
pciutils
|
||||
tree
|
||||
usbutils
|
||||
vim
|
||||
];
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
# distributedBuilds = true;
|
||||
# buildMachines = [{
|
||||
# hostName = "z790prors.oglehome";
|
||||
# system = "x86_64-linux";
|
||||
# protocol = "ssh-ng";
|
||||
# sshUser = "johno";
|
||||
# sshKey = "/root/.ssh/id_ed25519";
|
||||
# maxJobs = 3;
|
||||
# speedFactor = 2;
|
||||
# }];
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
max-jobs = "auto";
|
||||
trusted-users = [ "johno" ];
|
||||
substituters = [
|
||||
];
|
||||
};
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 10d";
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,6 @@ with lib;
|
||||
|
||||
{
|
||||
imports = [
|
||||
./common.nix
|
||||
./audio
|
||||
./bluetooth
|
||||
./btrfs
|
||||
@@ -32,6 +31,7 @@ with lib;
|
||||
LC_TELEPHONE = "en_US.UTF-8";
|
||||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
time.timeZone = "America/Los_Angeles";
|
||||
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
@@ -49,7 +49,42 @@ with lib;
|
||||
# Enable the OpenSSH daemon.
|
||||
services.openssh.enable = true;
|
||||
|
||||
# NixOS-specific gc option (not available on Darwin)
|
||||
nix.gc.randomizedDelaySec = "14m";
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
glances
|
||||
pciutils
|
||||
tree
|
||||
usbutils
|
||||
vim
|
||||
];
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
# distributedBuilds = true;
|
||||
# buildMachines = [{
|
||||
# hostName = "z790prors.oglehome";
|
||||
# system = "x86_64-linux";
|
||||
# protocol = "ssh-ng";
|
||||
# sshUser = "johno";
|
||||
# sshKey = "/root/.ssh/id_ed25519";
|
||||
# maxJobs = 3;
|
||||
# speedFactor = 2;
|
||||
# }];
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
max-jobs = "auto";
|
||||
trusted-users = [ "johno" ];
|
||||
substituters = [
|
||||
];
|
||||
};
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
randomizedDelaySec = "14m";
|
||||
options = "--delete-older-than 10d";
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user