feat(skills): Add gitea_pr_review skill for managing PR review comments

Adds a new Claude Code skill that enables reading PR review comments and
posting replies on Gitea/Forgejo instances. Documents both the REST API
approach for reading reviews and the web endpoint approach for thread
replies, with fallback to top-level comments when thread replies aren't
possible due to authentication limitations.

Implements bead: nixos-configs-vru

.gitignore

@@ -1,2 +1,3 @@
 result
 thoughts
+.beads

flake.lock

@@ -21,6 +21,45 @@
         "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": false,
       "locked": {
@@ -159,6 +198,27 @@
         "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": {
       "inputs": {
         "nixpkgs": [
@@ -303,6 +363,7 @@
         "home-manager-unstable": "home-manager-unstable",
         "jovian": "jovian",
         "nix-darwin": "nix-darwin",
+        "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -324,6 +385,21 @@
         "repo": "default",
         "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",

flake.nix

@@ -47,6 +47,12 @@
       url = "github:steveyegge/beads";
       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
@@ -70,6 +76,7 @@
         home-manager.useUserPackages = true;
         home-manager.sharedModules = [
           inputs.plasma-manager.homeModules.plasma-manager
+          inputs.nix-doom-emacs-unstraightened.homeModule
         ];
         home-manager.extraSpecialArgs = {
           globalInputs = inputs;
@@ -98,6 +105,7 @@
         home-manager.useUserPackages = true;
         home-manager.sharedModules = [
           inputs.plasma-manager-unstable.homeModules.plasma-manager
+          inputs.nix-doom-emacs-unstraightened.homeModule
         ];
         home-manager.extraSpecialArgs = {
           globalInputs = inputs;
@@ -129,6 +137,9 @@
         ];
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
+        home-manager.sharedModules = [
+          inputs.nix-doom-emacs-unstraightened.homeModule
+        ];
         home-manager.extraSpecialArgs = {
           globalInputs = inputs;
         };
@@ -219,7 +230,11 @@
       system = "x86_64-linux";
       modules = nixosModules ++ [
         ./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; };
+        }
       ];
     };
 

home/home-desktop.nix

@@ -23,6 +23,7 @@
     kubectl.enable = true;
     tmux.enable = true;
     plasma-manager.enable = true;
+    starship.enable = true;
   };
 
   targets.genericLinux.enable = true;

home/home-laptop-compact.nix

@@ -23,6 +23,7 @@
     plasma-manager.enable = true;
     emacs.enable = true;
     i3_sway.enable = true;
+    starship.enable = true;
 
     # Launcher wrappers for excluded/optional packages
     launchers = {

home/home-live-usb.nix

@@ -14,8 +14,14 @@
     desktop.enable = true;
     tmux.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;
+    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

home/home-media-center.nix

@@ -20,6 +20,7 @@
     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
   };

home/home-server.nix

@@ -10,6 +10,8 @@
   home.roles = {
     base.enable = true;
     development.enable = true;
+    emacs.enable = true;
+    starship.enable = true;
     tmux.enable = true;
   };
 

home/roles/default.nix

@@ -19,5 +19,6 @@
     ./sync
     ./tmux
     ./emacs
+    ./starship
   ];
 }

home/roles/development/default.nix

@@ -85,12 +85,17 @@ in
         fi
       done
 
-      # Copy local skills from this repo
+      # 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"
-          cp "$file" "$dest"
+          # 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
 

home/roles/development/skills/gitea_pr_review.md

@@ -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

home/roles/development/skills/parallel_beads.md

@@ -93,7 +93,13 @@ Work on bead [BEAD_ID]: [BEAD_TITLE]
      - [List of changes made]"
      ```
 
-6. **Report results**:
+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
 ```
@@ -165,11 +171,11 @@ Example output:
 ```
 ## Parallel Beads Summary
 
-| Bead | PR | Status | Review |
+| Bead | PR | Bead Status | Review |
-|------|-----|--------|--------|
+|------|-----|-------------|--------|
-| beads-abc | #123 | Success | Approved |
+| beads-abc | #123 | in_review | Approved |
-| beads-xyz | #124 | Success | Needs changes |
+| beads-xyz | #124 | in_review | Needs changes |
-| beads-123 | - | Failed | Blocked by missing dependency |
+| beads-123 | - | open (failed) | Blocked by missing dependency |
 
 ### Failures/Blockers
 - beads-123: Could not complete because [reason]
@@ -177,6 +183,7 @@ Example output:
 ### Next Steps
 - Review PRs that need changes
 - Address blockers for failed beads
+- Run `/reconcile_beads` after PRs are merged to close beads
 ```
 
 ## Error Handling

home/roles/development/skills/reconcile_beads.md

@@ -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

home/roles/emacs/default.nix

@@ -23,55 +23,90 @@ let
     if pkgs.stdenv.isDarwin
     then pkgs.emacs-macport.pkgs.withPackages emacsPackages
     else pkgs.emacs.pkgs.withPackages emacsPackages;
+
+  # Path to doom config directory (relative to this file)
+  doomConfigDir = ./doom;
 in
 {
   options.home.roles.emacs = {
     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
+        ];
+      };
+    })
+  ]);
 }

home/roles/emacs/doom/packages.el

@@ -51,11 +51,21 @@
 
 ;; (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! 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
   :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")

home/roles/starship/default.nix

@@ -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;
+      };
+    };
+  };
+}

roles/common.nix

@@ -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;
+  };
+}

roles/darwin.nix

@@ -7,6 +7,10 @@ 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
@@ -43,8 +47,6 @@ in
       fi
     '';
 
-    time.timeZone = "America/Los_Angeles";
-
     # System preferences
     system.defaults = {
       # 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;
   };
 }

roles/default.nix

@@ -4,6 +4,7 @@ with lib;
 
 {
   imports = [
+    ./common.nix
     ./audio
     ./bluetooth
     ./btrfs
@@ -31,7 +32,6 @@ 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,42 +49,7 @@ with lib;
     # Enable the OpenSSH daemon.
     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;
   };
 }