Compare commits
6 Commits
bead/nixos
...
bead/nixos
| Author | SHA1 | Date | |
|---|---|---|---|
| f5ef23b2af | |||
| 1d9249ea83 | |||
| 2fdd2d5345 | |||
| 722cb315dc | |||
| e042acff16 | |||
| 4fe531f87f |
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
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
result
|
result
|
||||||
thoughts
|
thoughts
|
||||||
|
.beads
|
||||||
|
|||||||
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",
|
||||||
|
|||||||
11
flake.nix
11
flake.nix
@@ -47,6 +47,12 @@
|
|||||||
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
|
||||||
@@ -70,6 +76,7 @@
|
|||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
inputs.plasma-manager.homeModules.plasma-manager
|
inputs.plasma-manager.homeModules.plasma-manager
|
||||||
|
inputs.nix-doom-emacs-unstraightened.homeModule
|
||||||
];
|
];
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
globalInputs = inputs;
|
globalInputs = inputs;
|
||||||
@@ -98,6 +105,7 @@
|
|||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
inputs.plasma-manager-unstable.homeModules.plasma-manager
|
inputs.plasma-manager-unstable.homeModules.plasma-manager
|
||||||
|
inputs.nix-doom-emacs-unstraightened.homeModule
|
||||||
];
|
];
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
globalInputs = inputs;
|
globalInputs = inputs;
|
||||||
@@ -129,6 +137,9 @@
|
|||||||
];
|
];
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.sharedModules = [
|
||||||
|
inputs.nix-doom-emacs-unstraightened.homeModule
|
||||||
|
];
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
globalInputs = inputs;
|
globalInputs = inputs;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,7 +14,12 @@
|
|||||||
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;
|
starship.enable = true;
|
||||||
# development.enable = false; # Not needed for live USB
|
# development.enable = false; # Not needed for live USB
|
||||||
|
|||||||
@@ -93,7 +93,13 @@ Work on bead [BEAD_ID]: [BEAD_TITLE]
|
|||||||
- [List of changes made]"
|
- [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
|
- Return: PR URL, bead ID, success/failure status
|
||||||
- If blocked or unable to complete, explain what's blocking progress
|
- If blocked or unable to complete, explain what's blocking progress
|
||||||
```
|
```
|
||||||
@@ -165,11 +171,11 @@ Example output:
|
|||||||
```
|
```
|
||||||
## Parallel Beads Summary
|
## 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
|
### Failures/Blockers
|
||||||
- beads-123: Could not complete because [reason]
|
- beads-123: Could not complete because [reason]
|
||||||
@@ -177,6 +183,7 @@ Example output:
|
|||||||
### Next Steps
|
### Next Steps
|
||||||
- Review PRs that need changes
|
- Review PRs that need changes
|
||||||
- Address blockers for failed beads
|
- Address blockers for failed beads
|
||||||
|
- Run `/reconcile_beads` after PRs are merged to close beads
|
||||||
```
|
```
|
||||||
|
|
||||||
## Error Handling
|
## Error Handling
|
||||||
|
|||||||
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,13 +23,30 @@ 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 [
|
||||||
|
# Common configuration for both modes
|
||||||
|
{
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.emacs-all-the-icons-fonts
|
pkgs.emacs-all-the-icons-fonts
|
||||||
pkgs.fira-code
|
pkgs.fira-code
|
||||||
@@ -46,13 +63,16 @@ in
|
|||||||
pkgs.python3
|
pkgs.python3
|
||||||
];
|
];
|
||||||
|
|
||||||
|
fonts.fontconfig.enable = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Standard Doom Emacs mode (requires doom sync at runtime)
|
||||||
|
(mkIf (!cfg.prebuiltDoom) {
|
||||||
programs.emacs = {
|
programs.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = defaultEmacsPackage;
|
package = defaultEmacsPackage;
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fontconfig.enable = true;
|
|
||||||
|
|
||||||
# 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;
|
||||||
@@ -73,5 +93,20 @@ in
|
|||||||
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
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
})
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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")
|
||||||
|
|||||||
Reference in New Issue
Block a user