Compare commits
32 Commits
6544899d34
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 7a5f167a8c | |||
| 9e1003d4fc | |||
| bf600987e9 | |||
| 346ad3665d | |||
| 565acb1632 | |||
| b05c6d8c30 | |||
| 0f555fdd57 | |||
| 9973273b5e | |||
| f281384b69 | |||
| 4eec701729 | |||
| bbcb13881f | |||
| c28d6a7896 | |||
| 79ff0b8aa4 | |||
| 1d9249ea83 | |||
| 2fdd2d5345 | |||
| 722cb315dc | |||
| e042acff16 | |||
| 4fe531f87f | |||
| 266dee9f8f | |||
| 38395c238f | |||
| e4a1771f48 | |||
| ff1fb245ac | |||
| 82fb1738c1 | |||
| 425e4f4cee | |||
| 0e5b11e55d | |||
| 1ba1a8fc9d | |||
| 009b84656f | |||
| ef4e4509d3 | |||
| cd6b528692 | |||
| 3914b54c73 | |||
| 9aa74258f9 | |||
| 64dda20aa4 |
39
.beads/.gitignore
vendored
Normal file
39
.beads/.gitignore
vendored
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
# SQLite databases
|
||||||
|
*.db
|
||||||
|
*.db?*
|
||||||
|
*.db-journal
|
||||||
|
*.db-wal
|
||||||
|
*.db-shm
|
||||||
|
|
||||||
|
# Daemon runtime files
|
||||||
|
daemon.lock
|
||||||
|
daemon.log
|
||||||
|
daemon.pid
|
||||||
|
bd.sock
|
||||||
|
sync-state.json
|
||||||
|
last-touched
|
||||||
|
|
||||||
|
# Local version tracking (prevents upgrade notification spam after git ops)
|
||||||
|
.local_version
|
||||||
|
|
||||||
|
# Legacy database files
|
||||||
|
db.sqlite
|
||||||
|
bd.db
|
||||||
|
|
||||||
|
# Worktree redirect file (contains relative path to main repo's .beads/)
|
||||||
|
# Must not be committed as paths would be wrong in other clones
|
||||||
|
redirect
|
||||||
|
|
||||||
|
# Merge artifacts (temporary files from 3-way merge)
|
||||||
|
beads.base.jsonl
|
||||||
|
beads.base.meta.json
|
||||||
|
beads.left.jsonl
|
||||||
|
beads.left.meta.json
|
||||||
|
beads.right.jsonl
|
||||||
|
beads.right.meta.json
|
||||||
|
|
||||||
|
# NOTE: Do NOT add negation patterns (e.g., !issues.jsonl) here.
|
||||||
|
# They would override fork protection in .git/info/exclude, allowing
|
||||||
|
# contributors to accidentally commit upstream issue databases.
|
||||||
|
# The JSONL files (issues.jsonl, interactions.jsonl) and config files
|
||||||
|
# are tracked by git by default since no pattern above ignores them.
|
||||||
0
.beads/.sync.lock
Normal file
0
.beads/.sync.lock
Normal file
81
.beads/README.md
Normal file
81
.beads/README.md
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
# Beads - AI-Native Issue Tracking
|
||||||
|
|
||||||
|
Welcome to Beads! This repository uses **Beads** for issue tracking - a modern, AI-native tool designed to live directly in your codebase alongside your code.
|
||||||
|
|
||||||
|
## What is Beads?
|
||||||
|
|
||||||
|
Beads is issue tracking that lives in your repo, making it perfect for AI coding agents and developers who want their issues close to their code. No web UI required - everything works through the CLI and integrates seamlessly with git.
|
||||||
|
|
||||||
|
**Learn more:** [github.com/steveyegge/beads](https://github.com/steveyegge/beads)
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
### Essential Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Create new issues
|
||||||
|
bd create "Add user authentication"
|
||||||
|
|
||||||
|
# View all issues
|
||||||
|
bd list
|
||||||
|
|
||||||
|
# View issue details
|
||||||
|
bd show <issue-id>
|
||||||
|
|
||||||
|
# Update issue status
|
||||||
|
bd update <issue-id> --status in_progress
|
||||||
|
bd update <issue-id> --status done
|
||||||
|
|
||||||
|
# Sync with git remote
|
||||||
|
bd sync
|
||||||
|
```
|
||||||
|
|
||||||
|
### Working with Issues
|
||||||
|
|
||||||
|
Issues in Beads are:
|
||||||
|
- **Git-native**: Stored in `.beads/issues.jsonl` and synced like code
|
||||||
|
- **AI-friendly**: CLI-first design works perfectly with AI coding agents
|
||||||
|
- **Branch-aware**: Issues can follow your branch workflow
|
||||||
|
- **Always in sync**: Auto-syncs with your commits
|
||||||
|
|
||||||
|
## Why Beads?
|
||||||
|
|
||||||
|
✨ **AI-Native Design**
|
||||||
|
- Built specifically for AI-assisted development workflows
|
||||||
|
- CLI-first interface works seamlessly with AI coding agents
|
||||||
|
- No context switching to web UIs
|
||||||
|
|
||||||
|
🚀 **Developer Focused**
|
||||||
|
- Issues live in your repo, right next to your code
|
||||||
|
- Works offline, syncs when you push
|
||||||
|
- Fast, lightweight, and stays out of your way
|
||||||
|
|
||||||
|
🔧 **Git Integration**
|
||||||
|
- Automatic sync with git commits
|
||||||
|
- Branch-aware issue tracking
|
||||||
|
- Intelligent JSONL merge resolution
|
||||||
|
|
||||||
|
## Get Started with Beads
|
||||||
|
|
||||||
|
Try Beads in your own projects:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install Beads
|
||||||
|
curl -sSL https://raw.githubusercontent.com/steveyegge/beads/main/scripts/install.sh | bash
|
||||||
|
|
||||||
|
# Initialize in your repo
|
||||||
|
bd init
|
||||||
|
|
||||||
|
# Create your first issue
|
||||||
|
bd create "Try out Beads"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Learn More
|
||||||
|
|
||||||
|
- **Documentation**: [github.com/steveyegge/beads/docs](https://github.com/steveyegge/beads/tree/main/docs)
|
||||||
|
- **Quick Start Guide**: Run `bd quickstart`
|
||||||
|
- **Examples**: [github.com/steveyegge/beads/examples](https://github.com/steveyegge/beads/tree/main/examples)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
*Beads: Issue tracking that moves at the speed of thought* ⚡
|
||||||
62
.beads/config.yaml
Normal file
62
.beads/config.yaml
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
# Beads Configuration File
|
||||||
|
# This file configures default behavior for all bd commands in this repository
|
||||||
|
# All settings can also be set via environment variables (BD_* prefix)
|
||||||
|
# or overridden with command-line flags
|
||||||
|
|
||||||
|
# Issue prefix for this repository (used by bd init)
|
||||||
|
# If not set, bd init will auto-detect from directory name
|
||||||
|
# Example: issue-prefix: "myproject" creates issues like "myproject-1", "myproject-2", etc.
|
||||||
|
# issue-prefix: ""
|
||||||
|
|
||||||
|
# Use no-db mode: load from JSONL, no SQLite, write back after each command
|
||||||
|
# When true, bd will use .beads/issues.jsonl as the source of truth
|
||||||
|
# instead of SQLite database
|
||||||
|
# no-db: false
|
||||||
|
|
||||||
|
# Disable daemon for RPC communication (forces direct database access)
|
||||||
|
# no-daemon: false
|
||||||
|
|
||||||
|
# Disable auto-flush of database to JSONL after mutations
|
||||||
|
# no-auto-flush: false
|
||||||
|
|
||||||
|
# Disable auto-import from JSONL when it's newer than database
|
||||||
|
# no-auto-import: false
|
||||||
|
|
||||||
|
# Enable JSON output by default
|
||||||
|
# json: false
|
||||||
|
|
||||||
|
# Default actor for audit trails (overridden by BD_ACTOR or --actor)
|
||||||
|
# actor: ""
|
||||||
|
|
||||||
|
# Path to database (overridden by BEADS_DB or --db)
|
||||||
|
# db: ""
|
||||||
|
|
||||||
|
# Auto-start daemon if not running (can also use BEADS_AUTO_START_DAEMON)
|
||||||
|
# auto-start-daemon: true
|
||||||
|
|
||||||
|
# Debounce interval for auto-flush (can also use BEADS_FLUSH_DEBOUNCE)
|
||||||
|
# flush-debounce: "5s"
|
||||||
|
|
||||||
|
# Git branch for beads commits (bd sync will commit to this branch)
|
||||||
|
# IMPORTANT: Set this for team projects so all clones use the same sync branch.
|
||||||
|
# This setting persists across clones (unlike database config which is gitignored).
|
||||||
|
# Can also use BEADS_SYNC_BRANCH env var for local override.
|
||||||
|
# If not set, bd sync will require you to run 'bd config set sync.branch <branch>'.
|
||||||
|
sync-branch: "beads-sync"
|
||||||
|
|
||||||
|
# Multi-repo configuration (experimental - bd-307)
|
||||||
|
# Allows hydrating from multiple repositories and routing writes to the correct JSONL
|
||||||
|
# repos:
|
||||||
|
# primary: "." # Primary repo (where this database lives)
|
||||||
|
# additional: # Additional repos to hydrate from (read-only)
|
||||||
|
# - ~/beads-planning # Personal planning repo
|
||||||
|
# - ~/work-planning # Work planning repo
|
||||||
|
|
||||||
|
# Integration settings (access with 'bd config get/set')
|
||||||
|
# These are stored in the database, not in this file:
|
||||||
|
# - jira.url
|
||||||
|
# - jira.project
|
||||||
|
# - linear.url
|
||||||
|
# - linear.api-key
|
||||||
|
# - github.org
|
||||||
|
# - github.repo
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"database": "beads.db",
|
"database": "beads.db",
|
||||||
"jsonl_export": "issues.jsonl"
|
"jsonl_export": "sync_base.jsonl"
|
||||||
}
|
}
|
||||||
File diff suppressed because one or more lines are too long
130
.claude/commands/import_gitea_issues.md
Normal file
130
.claude/commands/import_gitea_issues.md
Normal file
@@ -0,0 +1,130 @@
|
|||||||
|
---
|
||||||
|
description: Import open Gitea issues as beads, skipping already-imported ones
|
||||||
|
---
|
||||||
|
|
||||||
|
# Import Gitea Issues as Beads
|
||||||
|
|
||||||
|
This skill imports open Gitea issues as beads, checking for duplicates to avoid re-importing already tracked issues.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- `tea` CLI must be installed and configured for the repository
|
||||||
|
- `bd` (beads) CLI must be installed
|
||||||
|
- Must be in a git repository with a Gitea/Forgejo remote
|
||||||
|
|
||||||
|
## Workflow
|
||||||
|
|
||||||
|
### Step 1: Get open Gitea issues
|
||||||
|
|
||||||
|
List all open issues using `tea`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
tea issues
|
||||||
|
```
|
||||||
|
|
||||||
|
This returns a table with columns: INDEX, TITLE, LABELS, MILESTONE
|
||||||
|
|
||||||
|
### Step 2: Get existing beads
|
||||||
|
|
||||||
|
List all current beads to check what's already imported:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bd list
|
||||||
|
```
|
||||||
|
|
||||||
|
Also check bead notes for issue URLs to identify imports:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bd list --json | jq -r '.[] | select(.notes != null) | .notes' | grep -oP 'issues/\K\d+'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 3: Check for already-linked PRs
|
||||||
|
|
||||||
|
Check if any open PRs reference beads (skip these issues as they're being worked on):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
tea pr list
|
||||||
|
```
|
||||||
|
|
||||||
|
Look for PRs with:
|
||||||
|
- Bead ID in title: `[nixos-configs-xxx]`
|
||||||
|
- Bead reference in body: `Implements bead:` or `Bead ID:`
|
||||||
|
|
||||||
|
### Step 4: For each untracked issue, create a bead
|
||||||
|
|
||||||
|
For each issue not already tracked:
|
||||||
|
|
||||||
|
1. **Get full issue details**:
|
||||||
|
```bash
|
||||||
|
tea issue [ISSUE_NUMBER]
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Determine bead type** based on issue content:
|
||||||
|
- "bug" - if issue mentions bug, error, broken, fix, crash
|
||||||
|
- "feature" - if issue mentions feature, add, new, enhancement
|
||||||
|
- "task" - default for other issues
|
||||||
|
|
||||||
|
3. **Create the bead**:
|
||||||
|
```bash
|
||||||
|
bd add "[ISSUE_TITLE]" \
|
||||||
|
--type=[TYPE] \
|
||||||
|
--priority=P2 \
|
||||||
|
--notes="Gitea issue: [ISSUE_URL]
|
||||||
|
|
||||||
|
Original issue description:
|
||||||
|
[ISSUE_BODY]"
|
||||||
|
```
|
||||||
|
|
||||||
|
Note: The `--notes` flag accepts multi-line content.
|
||||||
|
|
||||||
|
### Step 5: Report results
|
||||||
|
|
||||||
|
Present a summary:
|
||||||
|
|
||||||
|
```
|
||||||
|
## Gitea Issues Import Summary
|
||||||
|
|
||||||
|
### Imported as Beads
|
||||||
|
| Issue | Title | Bead ID | Type |
|
||||||
|
|-------|-------|---------|------|
|
||||||
|
| #5 | Add dark mode | nixos-configs-abc | feature |
|
||||||
|
| #3 | Config broken on reboot | nixos-configs-def | bug |
|
||||||
|
|
||||||
|
### Skipped (Already Tracked)
|
||||||
|
| Issue | Title | Reason |
|
||||||
|
|-------|-------|--------|
|
||||||
|
| #4 | Update flake | Existing bead: nixos-configs-xyz |
|
||||||
|
| #2 | Refactor roles | PR #7 references bead |
|
||||||
|
|
||||||
|
### Skipped (Other)
|
||||||
|
| Issue | Title | Reason |
|
||||||
|
|-------|-------|--------|
|
||||||
|
| #1 | Discussion: future plans | No actionable work |
|
||||||
|
```
|
||||||
|
|
||||||
|
## Type Detection Heuristics
|
||||||
|
|
||||||
|
Keywords to detect issue type:
|
||||||
|
|
||||||
|
**Bug indicators** (case-insensitive):
|
||||||
|
- bug, error, broken, fix, crash, fail, issue, problem, wrong, not working
|
||||||
|
|
||||||
|
**Feature indicators** (case-insensitive):
|
||||||
|
- feature, add, new, enhancement, implement, support, request, want, would be nice
|
||||||
|
|
||||||
|
**Task** (default):
|
||||||
|
- Anything not matching bug or feature patterns
|
||||||
|
|
||||||
|
## Error Handling
|
||||||
|
|
||||||
|
- **tea not configured**: Report error and exit
|
||||||
|
- **bd not available**: Report error and exit
|
||||||
|
- **Issue already has bead**: Skip and report in summary
|
||||||
|
- **Issue is a PR**: Skip (tea shows PRs and issues separately)
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- Default priority is P2; adjust manually after import if needed
|
||||||
|
- Issue labels from Gitea are not automatically mapped to bead tags
|
||||||
|
- Run this periodically to catch new issues
|
||||||
|
- After import, use `bd ready` to see which beads can be worked on
|
||||||
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
|
||||||
|
# Use bd merge for beads JSONL files
|
||||||
|
.beads/issues.jsonl merge=beads
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
result
|
result
|
||||||
thoughts
|
thoughts
|
||||||
|
.beads
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Build Live USB ISO from flake configuration
|
|
||||||
# Creates an uncompressed ISO suitable for Ventoy and other USB boot tools
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "Building Live USB ISO..."
|
|
||||||
nix build .#nixosConfigurations.live-usb.config.system.build.isoImage --show-trace
|
|
||||||
|
|
||||||
if [ -f "./result/iso/"*.iso ]; then
|
|
||||||
iso_file=$(ls ./result/iso/*.iso)
|
|
||||||
echo "✅ Build complete!"
|
|
||||||
echo "📁 ISO location: $iso_file"
|
|
||||||
echo "💾 Ready for Ventoy or dd to USB"
|
|
||||||
else
|
|
||||||
echo "❌ Build failed - no ISO file found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
76
flake.lock
generated
76
flake.lock
generated
@@ -21,6 +21,45 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"doomemacs": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767773143,
|
||||||
|
"narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=",
|
||||||
|
"owner": "doomemacs",
|
||||||
|
"repo": "doomemacs",
|
||||||
|
"rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "doomemacs",
|
||||||
|
"repo": "doomemacs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"emacs-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nix-doom-emacs-unstraightened"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": [
|
||||||
|
"nix-doom-emacs-unstraightened"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1768011937,
|
||||||
|
"narHash": "sha256-SnU2XTo34vwVaijs+4VwcXTNwMWO4nwzzs08N39UagA=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "emacs-overlay",
|
||||||
|
"rev": "79abf71d9897cf3b5189f7175cda1b1102abc65c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "emacs-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -159,6 +198,27 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-doom-emacs-unstraightened": {
|
||||||
|
"inputs": {
|
||||||
|
"doomemacs": "doomemacs",
|
||||||
|
"emacs-overlay": "emacs-overlay",
|
||||||
|
"nixpkgs": [],
|
||||||
|
"systems": "systems_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1768034604,
|
||||||
|
"narHash": "sha256-62pIZMvGHhYJmMiiBsxHqZt/dFyENPcFHlJq5NJF3Sw=",
|
||||||
|
"owner": "marienz",
|
||||||
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
|
"rev": "9b3b8044fe4ccdcbb2d6f733d7dbe4d5feea18bc",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "marienz",
|
||||||
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-github-actions": {
|
"nix-github-actions": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -303,6 +363,7 @@
|
|||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
"jovian": "jovian",
|
"jovian": "jovian",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
|
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
@@ -324,6 +385,21 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"systems_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
138
flake.nix
138
flake.nix
@@ -47,92 +47,84 @@
|
|||||||
url = "github:steveyegge/beads";
|
url = "github:steveyegge/beads";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nix-doom-emacs-unstraightened = {
|
||||||
|
url = "github:marienz/nix-doom-emacs-unstraightened";
|
||||||
|
# Don't follow nixpkgs to avoid rebuild issues with emacs-overlay
|
||||||
|
inputs.nixpkgs.follows = "";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
|
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
|
||||||
|
# Shared overlay function to reduce duplication across module sets
|
||||||
|
# Parameters:
|
||||||
|
# unstableOverlays: Additional overlays to apply when importing nixpkgs-unstable
|
||||||
|
mkBaseOverlay = { unstableOverlays ? [] }: (final: prev: {
|
||||||
|
unstable = import nixpkgs-unstable {
|
||||||
|
system = prev.stdenv.hostPlatform.system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
overlays = unstableOverlays;
|
||||||
|
};
|
||||||
|
custom = prev.callPackage ./packages {};
|
||||||
|
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable
|
||||||
|
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
|
||||||
|
});
|
||||||
|
|
||||||
|
# Shared home-manager configuration factory
|
||||||
|
# Parameters:
|
||||||
|
# sharedModules: Additional modules to include in home-manager.sharedModules
|
||||||
|
mkHomeManagerConfig = { sharedModules ? [] }: {
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.sharedModules = sharedModules ++ [
|
||||||
|
inputs.nix-doom-emacs-unstraightened.homeModule
|
||||||
|
];
|
||||||
|
home-manager.extraSpecialArgs = {
|
||||||
|
globalInputs = inputs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
nixosModules = [
|
nixosModules = [
|
||||||
./roles
|
./roles
|
||||||
] ++ [
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [ (mkBaseOverlay {}) ];
|
||||||
(final: prev: {
|
|
||||||
unstable = import nixpkgs-unstable {
|
|
||||||
system = prev.stdenv.hostPlatform.system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
custom = prev.callPackage ./packages {};
|
|
||||||
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable
|
|
||||||
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.sharedModules = [
|
|
||||||
inputs.plasma-manager.homeModules.plasma-manager
|
|
||||||
];
|
|
||||||
home-manager.extraSpecialArgs = {
|
|
||||||
globalInputs = inputs;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
(mkHomeManagerConfig {
|
||||||
|
sharedModules = [ inputs.plasma-manager.homeModules.plasma-manager ];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# Modules for unstable-based systems (like nix-deck)
|
# Modules for unstable-based systems (like nix-deck)
|
||||||
nixosModulesUnstable = [
|
nixosModulesUnstable = [
|
||||||
./roles
|
./roles
|
||||||
] ++ [
|
|
||||||
inputs.home-manager-unstable.nixosModules.home-manager
|
inputs.home-manager-unstable.nixosModules.home-manager
|
||||||
inputs.jovian.nixosModules.jovian
|
inputs.jovian.nixosModules.jovian
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [ (mkBaseOverlay {}) ];
|
||||||
(final: prev: {
|
|
||||||
unstable = import nixpkgs-unstable {
|
|
||||||
system = prev.stdenv.hostPlatform.system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
custom = prev.callPackage ./packages {};
|
|
||||||
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable
|
|
||||||
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.sharedModules = [
|
|
||||||
inputs.plasma-manager-unstable.homeModules.plasma-manager
|
|
||||||
];
|
|
||||||
home-manager.extraSpecialArgs = {
|
|
||||||
globalInputs = inputs;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
(mkHomeManagerConfig {
|
||||||
|
sharedModules = [ inputs.plasma-manager-unstable.homeModules.plasma-manager ];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
darwinModules = [
|
darwinModules = [
|
||||||
./roles/darwin.nix
|
./roles/darwin.nix
|
||||||
] ++ [
|
|
||||||
inputs.home-manager.darwinModules.home-manager
|
inputs.home-manager.darwinModules.home-manager
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(final: prev: {
|
(mkBaseOverlay {
|
||||||
unstable = import nixpkgs-unstable {
|
# Override claude-code in unstable to use our custom GCS-based build
|
||||||
system = prev.stdenv.hostPlatform.system;
|
# (needed for corporate networks that block npm registry)
|
||||||
config.allowUnfree = true;
|
unstableOverlays = [
|
||||||
overlays = [
|
(ufinal: uprev: {
|
||||||
# Override claude-code in unstable to use our custom GCS-based build
|
claude-code = uprev.callPackage ./packages/claude-code {};
|
||||||
# (needed for corporate networks that block npm registry)
|
})
|
||||||
(ufinal: uprev: {
|
];
|
||||||
claude-code = prev.custom.claude-code or (prev.callPackage ./packages {}).claude-code;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
custom = prev.callPackage ./packages {};
|
|
||||||
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable
|
|
||||||
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.extraSpecialArgs = {
|
|
||||||
globalInputs = inputs;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
(mkHomeManagerConfig { sharedModules = []; })
|
||||||
];
|
];
|
||||||
|
|
||||||
in {
|
in {
|
||||||
@@ -219,7 +211,11 @@
|
|||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = nixosModules ++ [
|
modules = nixosModules ++ [
|
||||||
./machines/john-endesktop/configuration.nix
|
./machines/john-endesktop/configuration.nix
|
||||||
# Minimal server - no home-manager needed
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager.users.johno = import ./home/home-server.nix;
|
||||||
|
home-manager.extraSpecialArgs = { inherit system; };
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -260,6 +256,16 @@
|
|||||||
export PATH="${pkgs.lib.makeBinPath commonDeps}:$PATH"
|
export PATH="${pkgs.lib.makeBinPath commonDeps}:$PATH"
|
||||||
${builtins.readFile ./scripts/upgrade.sh}
|
${builtins.readFile ./scripts/upgrade.sh}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
bootstrap = pkgs.writeShellScriptBin "bootstrap" ''
|
||||||
|
export PATH="${pkgs.lib.makeBinPath commonDeps}:$PATH"
|
||||||
|
${builtins.readFile ./scripts/bootstrap.sh}
|
||||||
|
'';
|
||||||
|
|
||||||
|
build-liveusb = pkgs.writeShellScriptBin "build-liveusb" ''
|
||||||
|
export PATH="${pkgs.lib.makeBinPath commonDeps}:$PATH"
|
||||||
|
${builtins.readFile ./scripts/build-liveusb.sh}
|
||||||
|
'';
|
||||||
in {
|
in {
|
||||||
update-doomemacs = {
|
update-doomemacs = {
|
||||||
type = "app";
|
type = "app";
|
||||||
@@ -277,6 +283,14 @@
|
|||||||
type = "app";
|
type = "app";
|
||||||
program = "${upgrade}/bin/upgrade";
|
program = "${upgrade}/bin/upgrade";
|
||||||
};
|
};
|
||||||
|
bootstrap = {
|
||||||
|
type = "app";
|
||||||
|
program = "${bootstrap}/bin/bootstrap";
|
||||||
|
};
|
||||||
|
build-liveusb = {
|
||||||
|
type = "app";
|
||||||
|
program = "${build-liveusb}/bin/build-liveusb";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
kubectl.enable = true;
|
kubectl.enable = true;
|
||||||
tmux.enable = true;
|
tmux.enable = true;
|
||||||
plasma-manager.enable = true;
|
plasma-manager.enable = true;
|
||||||
|
starship.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
targets.genericLinux.enable = true;
|
targets.genericLinux.enable = true;
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
plasma-manager.enable = true;
|
plasma-manager.enable = true;
|
||||||
emacs.enable = true;
|
emacs.enable = true;
|
||||||
i3_sway.enable = true;
|
i3_sway.enable = true;
|
||||||
|
starship.enable = true;
|
||||||
|
|
||||||
# Launcher wrappers for excluded/optional packages
|
# Launcher wrappers for excluded/optional packages
|
||||||
launchers = {
|
launchers = {
|
||||||
|
|||||||
@@ -14,8 +14,14 @@
|
|||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
tmux.enable = true;
|
tmux.enable = true;
|
||||||
plasma-manager.enable = true;
|
plasma-manager.enable = true;
|
||||||
emacs.enable = true;
|
emacs = {
|
||||||
|
enable = true;
|
||||||
|
# Use pre-built Doom Emacs - all packages built at nix build time
|
||||||
|
# This means no doom sync is needed after booting the live USB
|
||||||
|
prebuiltDoom = true;
|
||||||
|
};
|
||||||
i3_sway.enable = true;
|
i3_sway.enable = true;
|
||||||
|
starship.enable = true;
|
||||||
# development.enable = false; # Not needed for live USB
|
# development.enable = false; # Not needed for live USB
|
||||||
# communication.enable = false; # Not needed for live USB
|
# communication.enable = false; # Not needed for live USB
|
||||||
# office.enable = false; # Not needed for live USB
|
# office.enable = false; # Not needed for live USB
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
plasma-manager.enable = true;
|
plasma-manager.enable = true;
|
||||||
emacs.enable = true;
|
emacs.enable = true;
|
||||||
i3_sway.enable = true;
|
i3_sway.enable = true;
|
||||||
|
starship.enable = true;
|
||||||
# office.enable = false; # Not needed for media center
|
# office.enable = false; # Not needed for media center
|
||||||
# sync.enable = false; # Shared machine, no personal file sync
|
# sync.enable = false; # Shared machine, no personal file sync
|
||||||
};
|
};
|
||||||
|
|||||||
27
home/home-server.nix
Normal file
27
home/home-server.nix
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{ 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;
|
||||||
|
kubectl.enable = true;
|
||||||
|
starship.enable = true;
|
||||||
|
tmux.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
targets.genericLinux.enable = true;
|
||||||
|
home.sessionVariables = {};
|
||||||
|
home.sessionPath = [];
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
./roles
|
||||||
|
./roles/base-linux
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -19,5 +19,6 @@
|
|||||||
./sync
|
./sync
|
||||||
./tmux
|
./tmux
|
||||||
./emacs
|
./emacs
|
||||||
|
./starship
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ in
|
|||||||
|
|
||||||
# Custom packages
|
# Custom packages
|
||||||
pkgs.custom.tea-rbw
|
pkgs.custom.tea-rbw
|
||||||
pkgs.custom.perles
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Install Claude Code humanlayer command and agent plugins
|
# Install Claude Code humanlayer command and agent plugins
|
||||||
@@ -85,11 +84,25 @@ in
|
|||||||
fi
|
fi
|
||||||
done
|
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${
|
$DRY_RUN_CMD echo "Claude Code humanlayer commands and agents installed successfully${
|
||||||
if cfg.allowArbitraryClaudeCodeModelSelection
|
if cfg.allowArbitraryClaudeCodeModelSelection
|
||||||
then " (model specifications preserved)"
|
then " (model specifications preserved)"
|
||||||
else " (model selection removed)"
|
else " (model selection removed)"
|
||||||
}"
|
} + local skills"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Set up beads Claude Code integration (hooks for SessionStart/PreCompact)
|
# Set up beads Claude Code integration (hooks for SessionStart/PreCompact)
|
||||||
|
|||||||
244
home/roles/development/skills/gitea_pr_review.md
Normal file
244
home/roles/development/skills/gitea_pr_review.md
Normal file
@@ -0,0 +1,244 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
205
home/roles/development/skills/parallel_beads.md
Normal file
205
home/roles/development/skills/parallel_beads.md
Normal file
@@ -0,0 +1,205 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
88
home/roles/development/skills/reconcile_beads.md
Normal file
88
home/roles/development/skills/reconcile_beads.md
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
@@ -23,55 +23,90 @@ let
|
|||||||
if pkgs.stdenv.isDarwin
|
if pkgs.stdenv.isDarwin
|
||||||
then pkgs.emacs-macport.pkgs.withPackages emacsPackages
|
then pkgs.emacs-macport.pkgs.withPackages emacsPackages
|
||||||
else pkgs.emacs.pkgs.withPackages emacsPackages;
|
else pkgs.emacs.pkgs.withPackages emacsPackages;
|
||||||
|
|
||||||
|
# Path to doom config directory (relative to this file)
|
||||||
|
doomConfigDir = ./doom;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.emacs = {
|
options.home.roles.emacs = {
|
||||||
enable = mkEnableOption "Doom Emacs with vterm and tree-sitter support";
|
enable = mkEnableOption "Doom Emacs with vterm and tree-sitter support";
|
||||||
|
|
||||||
|
prebuiltDoom = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Use nix-doom-emacs-unstraightened to pre-build all Doom packages at
|
||||||
|
nix build time. This eliminates the need to run `doom sync` after
|
||||||
|
first boot, making it ideal for live USB images or immutable systems.
|
||||||
|
|
||||||
|
When enabled, the doom configuration is read-only (stored in nix store).
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable (mkMerge [
|
||||||
home.packages = [
|
# Common configuration for both modes
|
||||||
pkgs.emacs-all-the-icons-fonts
|
{
|
||||||
pkgs.fira-code
|
home.packages = [
|
||||||
pkgs.fontconfig
|
pkgs.emacs-all-the-icons-fonts
|
||||||
pkgs.graphviz
|
pkgs.fira-code
|
||||||
pkgs.isort
|
pkgs.fontconfig
|
||||||
pkgs.nerd-fonts.fira-code
|
pkgs.graphviz
|
||||||
pkgs.nerd-fonts.droid-sans-mono
|
pkgs.isort
|
||||||
pkgs.nil # nix lsp language server
|
pkgs.nerd-fonts.fira-code
|
||||||
pkgs.nixfmt-rfc-style
|
pkgs.nerd-fonts.droid-sans-mono
|
||||||
(pkgs.ripgrep.override {withPCRE2 = true;})
|
pkgs.nil # nix lsp language server
|
||||||
pkgs.pipenv
|
pkgs.nixfmt-rfc-style
|
||||||
pkgs.poetry
|
(pkgs.ripgrep.override {withPCRE2 = true;})
|
||||||
pkgs.python3
|
pkgs.pipenv
|
||||||
];
|
pkgs.poetry
|
||||||
|
pkgs.python3
|
||||||
|
];
|
||||||
|
|
||||||
programs.emacs = {
|
fonts.fontconfig.enable = true;
|
||||||
enable = true;
|
}
|
||||||
package = defaultEmacsPackage;
|
|
||||||
};
|
|
||||||
|
|
||||||
fonts.fontconfig.enable = true;
|
# Standard Doom Emacs mode (requires doom sync at runtime)
|
||||||
|
(mkIf (!cfg.prebuiltDoom) {
|
||||||
|
programs.emacs = {
|
||||||
|
enable = true;
|
||||||
|
package = defaultEmacsPackage;
|
||||||
|
};
|
||||||
|
|
||||||
# Mount emacs and tree-sitter grammars from nix store
|
# Mount emacs and tree-sitter grammars from nix store
|
||||||
home.file = {
|
home.file = {
|
||||||
"${config.xdg.configHome}/emacs".source = doomEmacs;
|
"${config.xdg.configHome}/emacs".source = doomEmacs;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.sessionPath = [
|
home.sessionPath = [
|
||||||
"${config.xdg.configHome}/emacs/bin"
|
"${config.xdg.configHome}/emacs/bin"
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
DOOMDIR = "${config.xdg.configHome}/doom";
|
DOOMDIR = "${config.xdg.configHome}/doom";
|
||||||
DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
|
DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Use mkOutOfStoreSymlink instead?
|
# TODO: Use mkOutOfStoreSymlink instead?
|
||||||
home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||||
# Always remove and recreate the symlink to ensure it points to the source directory
|
# Always remove and recreate the symlink to ensure it points to the source directory
|
||||||
rm -rf "${config.xdg.configHome}/doom"
|
rm -rf "${config.xdg.configHome}/doom"
|
||||||
ln -sf "${config.home.homeDirectory}/nixos-configs/home/roles/emacs/doom" "${config.xdg.configHome}/doom"
|
ln -sf "${config.home.homeDirectory}/nixos-configs/home/roles/emacs/doom" "${config.xdg.configHome}/doom"
|
||||||
'';
|
'';
|
||||||
};
|
})
|
||||||
|
|
||||||
|
# Pre-built Doom Emacs mode (no doom sync needed - ideal for live USB)
|
||||||
|
(mkIf cfg.prebuiltDoom {
|
||||||
|
programs.doom-emacs = {
|
||||||
|
enable = true;
|
||||||
|
doomDir = doomConfigDir;
|
||||||
|
doomLocalDir = "${config.xdg.dataHome}/doom";
|
||||||
|
# Add extra packages that aren't part of Doom but needed for our config
|
||||||
|
extraPackages = epkgs: [
|
||||||
|
epkgs.vterm
|
||||||
|
epkgs.treesit-grammars.with-all-grammars
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,6 +167,20 @@
|
|||||||
claude-code-ide-window-side 'right
|
claude-code-ide-window-side 'right
|
||||||
claude-code-ide-window-width 90))
|
claude-code-ide-window-width 90))
|
||||||
|
|
||||||
|
(use-package! beads
|
||||||
|
:commands (beads)
|
||||||
|
:init
|
||||||
|
(map! :leader
|
||||||
|
(:prefix ("o" . "open")
|
||||||
|
(:prefix ("B" . "beads")
|
||||||
|
:desc "List issues" "B" (cmd! (require 'beads) (beads-list))
|
||||||
|
:desc "Project issues" "p" (cmd! (require 'beads) (beads-project-list))
|
||||||
|
:desc "Activity feed" "a" (cmd! (require 'beads) (beads-activity))
|
||||||
|
:desc "Stale issues" "s" (cmd! (require 'beads) (beads-stale))
|
||||||
|
:desc "Orphaned issues" "o" (cmd! (require 'beads) (beads-orphans))
|
||||||
|
:desc "Find duplicates" "d" (cmd! (require 'beads) (beads-duplicates))
|
||||||
|
:desc "Lint issues" "l" (cmd! (require 'beads) (beads-lint))))))
|
||||||
|
|
||||||
(after! gptel
|
(after! gptel
|
||||||
(require 'gptel-tool-library)
|
(require 'gptel-tool-library)
|
||||||
(setq gptel-tool-library-use-maybe-safe t
|
(setq gptel-tool-library-use-maybe-safe t
|
||||||
|
|||||||
@@ -51,11 +51,21 @@
|
|||||||
|
|
||||||
;; (package! org-caldav)
|
;; (package! org-caldav)
|
||||||
|
|
||||||
|
;; Note: Packages with custom recipes must be pinned for nix-doom-emacs-unstraightened
|
||||||
|
;; to build deterministically. Update pins when upgrading packages.
|
||||||
|
|
||||||
(package! gptel :recipe (:nonrecursive t))
|
(package! gptel :recipe (:nonrecursive t))
|
||||||
|
|
||||||
(package! claude-code-ide
|
(package! claude-code-ide
|
||||||
:recipe (:host github :repo "manzaltu/claude-code-ide.el"))
|
:recipe (:host github :repo "manzaltu/claude-code-ide.el")
|
||||||
|
:pin "760240d7f03ff16f90ede9d4f4243cd94f3fed73")
|
||||||
|
|
||||||
(package! gptel-tool-library
|
(package! gptel-tool-library
|
||||||
:recipe (:host github :repo "aard-fi/gptel-tool-library"
|
:recipe (:host github :repo "aard-fi/gptel-tool-library"
|
||||||
:files ("*.el")))
|
:files ("*.el"))
|
||||||
|
:pin "baffc3b0d74a2b7cbda0d5cd6dd7726d6ccaca83")
|
||||||
|
|
||||||
|
(package! beads
|
||||||
|
:recipe (:type git :repo "https://codeberg.org/ctietze/beads.el.git"
|
||||||
|
:files ("lisp/*.el"))
|
||||||
|
:pin "f40a6461d3c0fa0969311bbb6a1e30d1bba86c88")
|
||||||
|
|||||||
72
home/roles/starship/default.nix
Normal file
72
home/roles/starship/default.nix
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
{ 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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ with lib;
|
|||||||
enable = true;
|
enable = true;
|
||||||
autologin = true;
|
autologin = true;
|
||||||
wayland = true;
|
wayland = true;
|
||||||
|
appLauncherServer = true;
|
||||||
jellyfinScaleFactor = 1.0;
|
jellyfinScaleFactor = 1.0;
|
||||||
};
|
};
|
||||||
nfs-mounts.enable = true;
|
nfs-mounts.enable = true;
|
||||||
|
|||||||
@@ -170,6 +170,7 @@ This document outlines the plan to migrate the john-endesktop server from Arch L
|
|||||||
```bash
|
```bash
|
||||||
blkid /dev/nvme0n1p5
|
blkid /dev/nvme0n1p5
|
||||||
# Note the UUID for updating hardware-configuration.nix
|
# 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**
|
8. **Copy your NixOS configuration to the server**
|
||||||
@@ -388,11 +389,11 @@ After successful migration and 24-48 hours of stable operation:
|
|||||||
|
|
||||||
Pre-migration:
|
Pre-migration:
|
||||||
- [x] nvme0n1p5 removal from media pool complete
|
- [x] nvme0n1p5 removal from media pool complete
|
||||||
- [ ] Recent backup verified (< 24 hours)
|
- [x] Recent backup verified (< 24 hours)
|
||||||
- [ ] Maintenance window scheduled
|
- [x] Maintenance window scheduled
|
||||||
- [ ] NixOS ISO downloaded
|
- [x] NixOS ISO downloaded
|
||||||
- [ ] Bootable USB created
|
- [x] Bootable USB created
|
||||||
- [ ] NixOS config builds successfully
|
- [x] NixOS config builds successfully
|
||||||
|
|
||||||
During migration:
|
During migration:
|
||||||
- [ ] ZFS pools exported
|
- [ ] ZFS pools exported
|
||||||
|
|||||||
@@ -104,6 +104,23 @@ with lib;
|
|||||||
# User configuration
|
# User configuration
|
||||||
roles.users.enable = true;
|
roles.users.enable = true;
|
||||||
|
|
||||||
|
# k3s agent configuration
|
||||||
|
roles.k3s-node = {
|
||||||
|
enable = true;
|
||||||
|
role = "agent";
|
||||||
|
# serverAddr defaults to https://10.0.0.222:6443
|
||||||
|
# tokenFile defaults to /etc/k3s/token
|
||||||
|
extraFlags = [
|
||||||
|
# Node labels for workload scheduling
|
||||||
|
# fast-cpu: This node has a faster CPU than other cluster nodes
|
||||||
|
"--node-label=fast-cpu=true"
|
||||||
|
# fast-storage: This node is the NFS host with fast local storage access
|
||||||
|
"--node-label=fast-storage=true"
|
||||||
|
# k3s-upgrade=disabled: NixOS manages k3s upgrades via Nix, not system-upgrade-controller
|
||||||
|
"--node-label=k3s-upgrade=disabled"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# Time zone
|
# Time zone
|
||||||
time.timeZone = "America/Los_Angeles"; # Adjust as needed
|
time.timeZone = "America/Los_Angeles"; # Adjust as needed
|
||||||
|
|
||||||
|
|||||||
@@ -18,12 +18,29 @@
|
|||||||
# File systems - these will need to be updated after installation
|
# File systems - these will need to be updated after installation
|
||||||
# The nvme0n1p5 partition will be formatted as btrfs for NixOS root
|
# The nvme0n1p5 partition will be formatted as btrfs for NixOS root
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
# Update this device path after installation
|
device = "/dev/disk/by-uuid/5f4ad025-bfab-4aed-a933-6638348059e5";
|
||||||
device = "/dev/disk/by-uuid/CHANGE-THIS-TO-YOUR-UUID";
|
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=@" "compress=zstd" "noatime" ];
|
options = [ "subvol=@" "compress=zstd" "noatime" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/disk/by-uuid/5f4ad025-bfab-4aed-a933-6638348059e5";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@home" "compress=zstd" "noatime" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/nix" = {
|
||||||
|
device = "/dev/disk/by-uuid/5f4ad025-bfab-4aed-a933-6638348059e5";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@nix" "compress=zstd" "noatime" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/var/log" = {
|
||||||
|
device = "/dev/disk/by-uuid/5f4ad025-bfab-4aed-a933-6638348059e5";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@log" "compress=zstd" "noatime" ];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
# This should match your current EFI partition
|
# This should match your current EFI partition
|
||||||
device = "/dev/disk/by-uuid/F5C6-D570";
|
device = "/dev/disk/by-uuid/F5C6-D570";
|
||||||
@@ -35,10 +52,8 @@
|
|||||||
# The pools should be imported automatically via boot.zfs.extraPools
|
# The pools should be imported automatically via boot.zfs.extraPools
|
||||||
# /media and /swarmvols will be mounted by ZFS
|
# /media and /swarmvols will be mounted by ZFS
|
||||||
|
|
||||||
# Swap - using ZFS zvol
|
# No swap needed - 23GB RAM is sufficient for this NFS/ZFS server
|
||||||
swapDevices = [
|
swapDevices = [ ];
|
||||||
{ device = "/dev/zvol/media/swap"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
# CPU microcode
|
# CPU microcode
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|||||||
@@ -41,14 +41,9 @@
|
|||||||
boot.initrd.luks.devices."luks-b614167b-9045-4234-a441-ac6f60a96d81".device = "/dev/disk/by-uuid/b614167b-9045-4234-a441-ac6f60a96d81";
|
boot.initrd.luks.devices."luks-b614167b-9045-4234-a441-ac6f60a96d81".device = "/dev/disk/by-uuid/b614167b-9045-4234-a441-ac6f60a96d81";
|
||||||
|
|
||||||
services.logind.settings.Login = {
|
services.logind.settings.Login = {
|
||||||
HandleLidSwitch = "suspend-then-hibernate";
|
|
||||||
HandlePowerKey = "hibernate";
|
HandlePowerKey = "hibernate";
|
||||||
HandlePowerKeyLongPress = "poweroff";
|
HandlePowerKeyLongPress = "poweroff";
|
||||||
};
|
};
|
||||||
systemd.sleep.extraConfig = ''
|
|
||||||
HibernateDelaySec=30m
|
|
||||||
SuspendState=mem
|
|
||||||
'';
|
|
||||||
|
|
||||||
networking.hostName = "nix-book"; # Define your hostname.
|
networking.hostName = "nix-book"; # Define your hostname.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
|||||||
@@ -17,6 +17,15 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
wayland = true;
|
wayland = true;
|
||||||
};
|
};
|
||||||
|
nvidia = {
|
||||||
|
enable = true;
|
||||||
|
package = "latest";
|
||||||
|
graphics.extraPackages = with pkgs; [
|
||||||
|
mesa
|
||||||
|
libvdpau-va-gl
|
||||||
|
libva-vdpau-driver
|
||||||
|
];
|
||||||
|
};
|
||||||
users.enable = true;
|
users.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -29,28 +38,13 @@
|
|||||||
wsl.wslConf.network.hostname = "wixos";
|
wsl.wslConf.network.hostname = "wixos";
|
||||||
wsl.wslConf.user.default = "johno";
|
wsl.wslConf.user.default = "johno";
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
# WSL-specific environment variables for graphics
|
||||||
hardware.graphics = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
mesa
|
|
||||||
libvdpau-va-gl
|
|
||||||
libva-vdpau-driver
|
|
||||||
];
|
|
||||||
};
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
LD_LIBRARY_PATH = [
|
LD_LIBRARY_PATH = [
|
||||||
"/usr/lib/wsl/lib"
|
"/usr/lib/wsl/lib"
|
||||||
"/run/opengl-driver/lib"
|
"/run/opengl-driver/lib"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
hardware.nvidia = {
|
|
||||||
modesetting.enable = true;
|
|
||||||
nvidiaSettings = true;
|
|
||||||
open = true;
|
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
|
||||||
};
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
|||||||
@@ -25,8 +25,12 @@ with lib;
|
|||||||
wayland = true;
|
wayland = true;
|
||||||
x11 = true;
|
x11 = true;
|
||||||
};
|
};
|
||||||
|
kodi.enable = true;
|
||||||
nfs-mounts.enable = true;
|
nfs-mounts.enable = true;
|
||||||
nvidia.enable = true;
|
nvidia = {
|
||||||
|
enable = true;
|
||||||
|
graphics.enable32Bit = true;
|
||||||
|
};
|
||||||
printing.enable = true;
|
printing.enable = true;
|
||||||
remote-build.enableBuilder = true;
|
remote-build.enableBuilder = true;
|
||||||
users.enable = true;
|
users.enable = true;
|
||||||
@@ -47,27 +51,11 @@ with lib;
|
|||||||
# Fix dual boot clock sync - tell Linux to use local time for hardware clock
|
# Fix dual boot clock sync - tell Linux to use local time for hardware clock
|
||||||
time.hardwareClockInLocalTime = true;
|
time.hardwareClockInLocalTime = true;
|
||||||
|
|
||||||
# NVIDIA Graphics configuration
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
|
||||||
hardware.graphics.enable = true;
|
|
||||||
hardware.graphics.enable32Bit = true;
|
|
||||||
|
|
||||||
# Set DP-0 as primary display with 164.90Hz refresh rate
|
# Set DP-0 as primary display with 164.90Hz refresh rate
|
||||||
services.xserver.displayManager.sessionCommands = ''
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --mode 3440x1440 --rate 164.90 --primary
|
${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --mode 3440x1440 --rate 164.90 --primary
|
||||||
'';
|
'';
|
||||||
|
|
||||||
hardware.nvidia = {
|
|
||||||
modesetting.enable = true;
|
|
||||||
nvidiaSettings = true;
|
|
||||||
package = pkgs.linuxPackages.nvidiaPackages.stable;
|
|
||||||
open = true;
|
|
||||||
|
|
||||||
# For gaming performance
|
|
||||||
powerManagement.enable = false;
|
|
||||||
powerManagement.finegrained = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
acceleration = "cuda";
|
acceleration = "cuda";
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
|
|
||||||
tea-rbw = pkgs.callPackage ./tea-rbw {};
|
tea-rbw = pkgs.callPackage ./tea-rbw {};
|
||||||
app-launcher-server = pkgs.callPackage ./app-launcher-server {};
|
app-launcher-server = pkgs.callPackage ./app-launcher-server {};
|
||||||
claude-code = pkgs.callPackage ./claude-code {};
|
claude-code = pkgs.callPackage ./claude-code {};
|
||||||
perles = pkgs.callPackage ./perles {};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
{ lib, buildGoModule, fetchFromGitHub }:
|
|
||||||
|
|
||||||
buildGoModule rec {
|
|
||||||
pname = "perles";
|
|
||||||
version = "unstable-2025-01-09";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "zjrosen";
|
|
||||||
repo = "perles";
|
|
||||||
rev = "main";
|
|
||||||
hash = "sha256-JgRayb4+mJ1r0AtdnQfqAw2+QRte+licsfZOaRgYqcs=";
|
|
||||||
};
|
|
||||||
|
|
||||||
vendorHash = "sha256-R7UWTdBuPteneRqxrWK51nqLtZwDsqQoMAcohN4fyak=";
|
|
||||||
|
|
||||||
# Tests require a real git repository context
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "A TUI for the Beads issue tracking system with BQL query language";
|
|
||||||
homepage = "https://github.com/zjrosen/perles";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = [ ];
|
|
||||||
mainProgram = "perles";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr, libxcb, wayland, wayland-scanner }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "vulkan-hdr-layer";
|
|
||||||
version = "63d2eec";
|
|
||||||
|
|
||||||
src = (fetchFromGitHub {
|
|
||||||
owner = "Zamundaaa";
|
|
||||||
repo = "VK_hdr_layer";
|
|
||||||
rev = "869199cd2746e7f69cf19955153080842b6dacfc";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
hash = "sha256-xfVYI+Aajmnf3BTaY2Ysg5fyDO6SwDFGyU0L+F+E3is=";
|
|
||||||
}).overrideAttrs (_: {
|
|
||||||
GIT_CONFIG_COUNT = 1;
|
|
||||||
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
|
|
||||||
GIT_CONFIG_VALUE_0 = "git@github.com:";
|
|
||||||
});
|
|
||||||
|
|
||||||
nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ];
|
|
||||||
|
|
||||||
buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland wayland-scanner ];
|
|
||||||
|
|
||||||
# Help vulkan-loader find the validation layers
|
|
||||||
setupHook = writeText "setup-hook" ''
|
|
||||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Layers providing Vulkan HDR";
|
|
||||||
homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
license = licenses.mit;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
35
roles/common.nix
Normal file
35
roles/common.nix
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
# 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,6 +7,10 @@ let
|
|||||||
setEnvironmentPath = "${config.system.build.setEnvironment}";
|
setEnvironmentPath = "${config.system.build.setEnvironment}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
./common.nix
|
||||||
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
# Salt manages /etc/bashrc, /etc/zshrc, /etc/zshenv
|
# Salt manages /etc/bashrc, /etc/zshrc, /etc/zshenv
|
||||||
# nix-darwin writes to .local variants for nix-specific configuration
|
# nix-darwin writes to .local variants for nix-specific configuration
|
||||||
@@ -43,8 +47,6 @@ in
|
|||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
time.timeZone = "America/Los_Angeles";
|
|
||||||
|
|
||||||
# System preferences
|
# System preferences
|
||||||
system.defaults = {
|
system.defaults = {
|
||||||
# Custom keyboard shortcuts
|
# Custom keyboard shortcuts
|
||||||
@@ -79,42 +81,5 @@ 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,10 +4,12 @@ with lib;
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./common.nix
|
||||||
./audio
|
./audio
|
||||||
./bluetooth
|
./bluetooth
|
||||||
./btrfs
|
./btrfs
|
||||||
./desktop
|
./desktop
|
||||||
|
./k3s-node
|
||||||
./kodi
|
./kodi
|
||||||
./nfs-mounts
|
./nfs-mounts
|
||||||
./nvidia
|
./nvidia
|
||||||
@@ -31,7 +33,6 @@ with lib;
|
|||||||
LC_TELEPHONE = "en_US.UTF-8";
|
LC_TELEPHONE = "en_US.UTF-8";
|
||||||
LC_TIME = "en_US.UTF-8";
|
LC_TIME = "en_US.UTF-8";
|
||||||
};
|
};
|
||||||
time.timeZone = "America/Los_Angeles";
|
|
||||||
|
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
@@ -49,42 +50,7 @@ with lib;
|
|||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
# NixOS-specific gc option (not available on Darwin)
|
||||||
git
|
nix.gc.randomizedDelaySec = "14m";
|
||||||
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;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
81
roles/k3s-node/default.nix
Normal file
81
roles/k3s-node/default.nix
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
{ lib, config, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.roles.k3s-node;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.roles.k3s-node = {
|
||||||
|
enable = mkEnableOption "Enable k3s node";
|
||||||
|
|
||||||
|
role = mkOption {
|
||||||
|
type = types.enum [ "server" "agent" ];
|
||||||
|
default = "agent";
|
||||||
|
description = "k3s role: server (control plane) or agent (worker)";
|
||||||
|
};
|
||||||
|
|
||||||
|
serverAddr = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "https://10.0.0.222:6443";
|
||||||
|
description = "URL of k3s server to join (required for agents, used for HA servers)";
|
||||||
|
};
|
||||||
|
|
||||||
|
tokenFile = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
default = "/etc/k3s/token";
|
||||||
|
description = "Path to file containing the cluster join token";
|
||||||
|
};
|
||||||
|
|
||||||
|
clusterInit = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Initialize a new cluster (first server only)";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraFlags = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [];
|
||||||
|
description = "Additional flags to pass to k3s";
|
||||||
|
};
|
||||||
|
|
||||||
|
gracefulNodeShutdown = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Enable graceful node shutdown";
|
||||||
|
};
|
||||||
|
|
||||||
|
openFirewall = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Open firewall ports for k3s";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
# k3s service configuration
|
||||||
|
services.k3s = {
|
||||||
|
enable = true;
|
||||||
|
role = cfg.role;
|
||||||
|
tokenFile = cfg.tokenFile;
|
||||||
|
extraFlags = cfg.extraFlags;
|
||||||
|
gracefulNodeShutdown.enable = cfg.gracefulNodeShutdown;
|
||||||
|
serverAddr = if (cfg.role == "agent" || !cfg.clusterInit) then cfg.serverAddr else "";
|
||||||
|
clusterInit = cfg.role == "server" && cfg.clusterInit;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Firewall rules for k3s
|
||||||
|
networking.firewall = mkIf cfg.openFirewall {
|
||||||
|
allowedTCPPorts = [
|
||||||
|
6443 # k3s API server
|
||||||
|
10250 # kubelet metrics
|
||||||
|
] ++ optionals (cfg.role == "server") [
|
||||||
|
2379 # etcd clients (HA)
|
||||||
|
2380 # etcd peers (HA)
|
||||||
|
];
|
||||||
|
allowedUDPPorts = [
|
||||||
|
8472 # flannel VXLAN
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -22,7 +22,7 @@ in
|
|||||||
appLauncherServer = {
|
appLauncherServer = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = true;
|
default = false;
|
||||||
description = "Enable HTTP app launcher server for remote control";
|
description = "Enable HTTP app launcher server for remote control";
|
||||||
};
|
};
|
||||||
port = mkOption {
|
port = mkOption {
|
||||||
|
|||||||
@@ -8,9 +8,89 @@ in
|
|||||||
{
|
{
|
||||||
options.roles.nvidia = {
|
options.roles.nvidia = {
|
||||||
enable = mkEnableOption "Enable the nvidia role";
|
enable = mkEnableOption "Enable the nvidia role";
|
||||||
|
|
||||||
|
# Driver configuration options
|
||||||
|
open = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Use the open source nvidia kernel driver (for Turing and newer GPUs).";
|
||||||
|
};
|
||||||
|
|
||||||
|
modesetting = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Enable kernel modesetting for nvidia.";
|
||||||
|
};
|
||||||
|
|
||||||
|
nvidiaSettings = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Enable the nvidia-settings GUI.";
|
||||||
|
};
|
||||||
|
|
||||||
|
package = mkOption {
|
||||||
|
type = types.enum [ "stable" "latest" "beta" "vulkan_beta" "production" ];
|
||||||
|
default = "stable";
|
||||||
|
description = "The nvidia driver package to use.";
|
||||||
|
};
|
||||||
|
|
||||||
|
powerManagement = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable nvidia power management (useful for laptops, not recommended for desktops).";
|
||||||
|
};
|
||||||
|
|
||||||
|
finegrained = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable fine-grained power management for Turing and newer GPUs.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
graphics = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Enable hardware graphics support.";
|
||||||
|
};
|
||||||
|
|
||||||
|
enable32Bit = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable 32-bit graphics libraries (needed for some games).";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraPackages = mkOption {
|
||||||
|
type = types.listOf types.package;
|
||||||
|
default = [];
|
||||||
|
description = "Extra packages to add to hardware.graphics.extraPackages.";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
# Set xserver video driver
|
||||||
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
|
# Graphics configuration
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = cfg.graphics.enable;
|
||||||
|
enable32Bit = cfg.graphics.enable32Bit;
|
||||||
|
extraPackages = cfg.graphics.extraPackages;
|
||||||
|
};
|
||||||
|
|
||||||
|
# NVIDIA driver configuration
|
||||||
|
hardware.nvidia = {
|
||||||
|
modesetting.enable = cfg.modesetting;
|
||||||
|
nvidiaSettings = cfg.nvidiaSettings;
|
||||||
|
open = cfg.open;
|
||||||
|
package = config.boot.kernelPackages.nvidiaPackages.${cfg.package};
|
||||||
|
powerManagement.enable = cfg.powerManagement.enable;
|
||||||
|
powerManagement.finegrained = cfg.powerManagement.finegrained;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Additional packages for nvidia support
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
libva-utils
|
libva-utils
|
||||||
nvidia-vaapi-driver
|
nvidia-vaapi-driver
|
||||||
|
|||||||
4
bootstrap.sh → scripts/bootstrap.sh
Executable file → Normal file
4
bootstrap.sh → scripts/bootstrap.sh
Executable file → Normal file
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# bootstrap.sh
|
# bootstrap.sh
|
||||||
# Usage: sudo ./bootstrap.sh <hostname>
|
# Usage: nix run .#bootstrap -- <hostname>
|
||||||
|
# Or: sudo ./scripts/bootstrap.sh <hostname>
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
NEW_HOSTNAME="${1:?missing hostname}"
|
NEW_HOSTNAME="${1:?missing hostname}"
|
||||||
@@ -8,4 +9,3 @@ FLAKE_URI="git+https://git.johnogle.info/johno/nixos-configs.git#${NEW_HOSTNAME}
|
|||||||
|
|
||||||
export NIX_CONFIG="experimental-features = nix-command flakes"
|
export NIX_CONFIG="experimental-features = nix-command flakes"
|
||||||
nixos-rebuild switch --flake "$FLAKE_URI"
|
nixos-rebuild switch --flake "$FLAKE_URI"
|
||||||
|
|
||||||
22
scripts/build-liveusb.sh
Normal file
22
scripts/build-liveusb.sh
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Build Live USB ISO from flake configuration
|
||||||
|
# Creates an uncompressed ISO suitable for Ventoy and other USB boot tools
|
||||||
|
# Usage: nix run .#build-liveusb
|
||||||
|
# Or: ./scripts/build-liveusb.sh
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}"
|
||||||
|
|
||||||
|
echo "Building Live USB ISO..."
|
||||||
|
nix build "${REPO_ROOT}#nixosConfigurations.live-usb.config.system.build.isoImage" --show-trace
|
||||||
|
|
||||||
|
if ls "${REPO_ROOT}/result/iso/"*.iso 1> /dev/null 2>&1; then
|
||||||
|
iso_file=$(ls "${REPO_ROOT}/result/iso/"*.iso)
|
||||||
|
echo "Build complete!"
|
||||||
|
echo "ISO location: $iso_file"
|
||||||
|
echo "Ready for Ventoy or dd to USB"
|
||||||
|
else
|
||||||
|
echo "Build failed - no ISO file found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user