feat(skills): Improve parallel beads workflow with in_review status

- Add step to mark beads as 'in_review' after PR creation - Add PR URL to bead notes for traceability - Create reconcile_beads skill to close beads when PRs are merged - Update summary table to show bead status instead of generic status Implements bead: nixos-configs-85h
2026-01-10 12:38:06 -08:00
11 changed files with 72 additions and 264 deletions
--- a/.beads/sync_base.jsonl
+++ b/.beads/sync_base.jsonl
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 result
 thoughts
-.beads
--- a/flake.lock
+++ b/flake.lock
@@ -21,45 +21,6 @@
        "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": {
@@ -198,27 +159,6 @@
        "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": [
@@ -363,7 +303,6 @@
        "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",
@@ -385,21 +324,6 @@
        "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",
--- a/flake.nix
+++ b/flake.nix
@@ -47,12 +47,6 @@
      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
@@ -76,7 +70,6 @@
        home-manager.useUserPackages = true;
        home-manager.sharedModules = [
          inputs.plasma-manager.homeModules.plasma-manager
-          inputs.nix-doom-emacs-unstraightened.homeModule
        ];
        home-manager.extraSpecialArgs = {
          globalInputs = inputs;
@@ -105,7 +98,6 @@
        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;
@@ -137,9 +129,6 @@
        ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
-        home-manager.sharedModules = [
-          inputs.nix-doom-emacs-unstraightened.homeModule
-        ];
        home-manager.extraSpecialArgs = {
          globalInputs = inputs;
        };
--- a/home/home-live-usb.nix
+++ b/home/home-live-usb.nix
@@ -14,12 +14,7 @@
    desktop.enable = true;
    tmux.enable = true;
    plasma-manager.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;
-    };
+    emacs.enable = true;
    i3_sway.enable = true;
    starship.enable = true;
    # development.enable = false;  # Not needed for live USB
--- a/home/roles/development/skills/reconcile_beads.md
+++ b/home/roles/development/skills/reconcile_beads.md
@@ -23,11 +23,9 @@ bd list --status=in_review

 1. **Get the PR URL from bead notes**:
   ```bash
-   bd show [BEAD_ID] --json | jq -r '.[0].notes'
+   bd show [BEAD_ID] --json | jq -r '.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+'`
+   Extract the PR URL (look for lines starting with "PR:" or containing pull request URLs)

 2. **Detect hosting provider**:
   - Run `git remote get-url origin`
@@ -40,10 +38,9 @@ bd list --status=in_review
     ```
   - For Gitea:
     ```bash
-     tea pr list --state=closed
+     tea pr view [PR_NUMBER]
     ```
-     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.
+     Look for "State: merged" or "State: closed"

 ### Step 3: Close merged beads

--- a/home/roles/emacs/default.nix
+++ b/home/roles/emacs/default.nix
@@ -23,90 +23,55 @@ 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 (mkMerge [
-    # Common configuration for both modes
-    {
-      home.packages = [
-        pkgs.emacs-all-the-icons-fonts
-        pkgs.fira-code
-        pkgs.fontconfig
-        pkgs.graphviz
-        pkgs.isort
-        pkgs.nerd-fonts.fira-code
-        pkgs.nerd-fonts.droid-sans-mono
-        pkgs.nil # nix lsp language server
-        pkgs.nixfmt-rfc-style
-        (pkgs.ripgrep.override {withPCRE2 = true;})
-        pkgs.pipenv
-        pkgs.poetry
-        pkgs.python3
-      ];
+  config = mkIf cfg.enable {
+    home.packages = [
+      pkgs.emacs-all-the-icons-fonts
+      pkgs.fira-code
+      pkgs.fontconfig
+      pkgs.graphviz
+      pkgs.isort
+      pkgs.nerd-fonts.fira-code
+      pkgs.nerd-fonts.droid-sans-mono
+      pkgs.nil # nix lsp language server
+      pkgs.nixfmt-rfc-style
+      (pkgs.ripgrep.override {withPCRE2 = true;})
+      pkgs.pipenv
+      pkgs.poetry
+      pkgs.python3
+    ];

-      fonts.fontconfig.enable = true;
-    }
+    programs.emacs = {
+      enable = true;
+      package = defaultEmacsPackage;
+    };

-    # Standard Doom Emacs mode (requires doom sync at runtime)
-    (mkIf (!cfg.prebuiltDoom) {
-      programs.emacs = {
-        enable = true;
-        package = defaultEmacsPackage;
-      };
+    fonts.fontconfig.enable = true;

-      # Mount emacs and tree-sitter grammars from nix store
-      home.file = {
-        "${config.xdg.configHome}/emacs".source = doomEmacs;
-      };
+    # Mount emacs and tree-sitter grammars from nix store
+    home.file = {
+      "${config.xdg.configHome}/emacs".source = doomEmacs;
+    };

-      home.sessionPath = [
-        "${config.xdg.configHome}/emacs/bin"
-      ];
+    home.sessionPath = [
+      "${config.xdg.configHome}/emacs/bin"
+    ];

-      home.sessionVariables = {
-        DOOMDIR = "${config.xdg.configHome}/doom";
-        DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
-      };
+    home.sessionVariables = {
+      DOOMDIR = "${config.xdg.configHome}/doom";
+      DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
+    };

-      # TODO: Use mkOutOfStoreSymlink instead?
-      home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
-        # Always remove and recreate the symlink to ensure it points to the source directory
-        rm -rf "${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
-        ];
-      };
-    })
-  ]);
+    # TODO: Use mkOutOfStoreSymlink instead?
+    home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
+      # Always remove and recreate the symlink to ensure it points to the source directory
+      rm -rf "${config.xdg.configHome}/doom"
+      ln -sf "${config.home.homeDirectory}/nixos-configs/home/roles/emacs/doom" "${config.xdg.configHome}/doom"
+    '';
+  };
 }
--- a/home/roles/emacs/doom/packages.el
+++ b/home/roles/emacs/doom/packages.el
@@ -51,21 +51,11 @@

 ;; (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")
-  :pin "760240d7f03ff16f90ede9d4f4243cd94f3fed73")
+  :recipe (:host github :repo "manzaltu/claude-code-ide.el"))

 (package! gptel-tool-library
  :recipe (:host github :repo "aard-fi/gptel-tool-library"
-           :files ("*.el"))
-  :pin "baffc3b0d74a2b7cbda0d5cd6dd7726d6ccaca83")
-
-(package! beads
-  :recipe (:type git :repo "https://codeberg.org/ctietze/beads.el.git"
-           :files ("lisp/*.el"))
-  :pin "f40a6461d3c0fa0969311bbb6a1e30d1bba86c88")
+           :files ("*.el")))
--- a/scripts/rotate-wallpaper.sh
+++ b/scripts/rotate-wallpaper.sh
@@ -1,30 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Rotate to the next wallpaper in the configured list."
-            echo ""
-            echo "This script increments the currentIndex in home/wallpapers/default.nix,"
-            echo "cycling through available wallpapers. Rebuild your system to apply"
-            echo "the new wallpaper."
-            echo ""
-            echo "Options:"
-            echo "  --help, -h    Show this help message"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            echo "Use --help for usage information"
-            exit 1
-            ;;
-    esac
-done
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
--- a/scripts/update-doomemacs.sh
+++ b/scripts/update-doomemacs.sh
@@ -1,30 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Update Doom Emacs to the latest commit from the doomemacs repository."
-            echo ""
-            echo "This script fetches the latest commit SHA from the default branch,"
-            echo "updates the rev and sha256 in home/roles/emacs/default.nix, and"
-            echo "prepares the configuration for a system rebuild."
-            echo ""
-            echo "Options:"
-            echo "  --help, -h    Show this help message"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            echo "Use --help for usage information"
-            exit 1
-            ;;
-    esac
-done
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -1,35 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Perform a major upgrade of the NixOS configuration."
-            echo ""
-            echo "This script runs the following steps:"
-            echo "  1. Update all flake inputs (nix flake update)"
-            echo "  2. Update Doom Emacs to the latest commit"
-            echo "  3. Update Claude Code to the latest version"
-            echo "  4. Rotate to the next wallpaper"
-            echo ""
-            echo "After completion, review changes with 'git diff' and rebuild"
-            echo "your system with 'sudo nixos-rebuild switch --flake .'"
-            echo ""
-            echo "Options:"
-            echo "  --help, -h    Show this help message"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            echo "Use --help for usage information"
-            exit 1
-            ;;
-    esac
-done
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'