Skip to content

feat(jujutsu): add enableJujutsuIntegration to home-manager options #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benvinegar merged 2 commits into from
Jul 3, 2026
+18 −0
Merged

feat(jujutsu): add enableJujutsuIntegration to home-manager options #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
981bd86
feat(jujutsu): add enableJujutsuIntegration to home-manager options
debarchito Jun 23, 2026
0a6aaf7
Merge branch 'main' into push-myqrprozmkmy
benvinegar Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nix-jujutsu-integration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"hunkdiff": minor
---

Add an `enableJujutsuIntegration` home-manager option that sets hunk as the jujutsu pager and switches `ui.diff-formatter` to `:git` so jj emits diffs hunk can render.
13 changes: 13 additions & 0 deletions nix/home-manager.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ in
description = "Whether to set hunk as the default git pager.";
};

enableJujutsuIntegration = mkOption {
type = types.bool;
default = false;
description = "Whether to set hunk as the default jujutsu pager. Also sets ui.diff-formatter to \":git\" so jj emits git-style diffs hunk can render.";
};

enableClaudeIntegration = mkOption {
type = types.bool;
default = false;
Expand All @@ -59,6 +65,13 @@ in

programs.git.settings.core.pager = mkIf cfg.enableGitIntegration "hunk pager";

programs.jujutsu.settings = mkIf cfg.enableJujutsuIntegration {
ui = {
diff-formatter = ":git";
pager = "hunk pager";
};
};

home.file = mkIf cfg.enableClaudeIntegration {
".claude/skills/hunk-review".source = "${cfg.package}/skills/hunk-review";
};
Expand Down