Draft
Conversation
Contributor
Author
|
Not quite ready yet. The flake.lock file need to be updated to contain the |
ambroisie
reviewed
Feb 25, 2026
modules/programs/ec.nix
Outdated
| home.packages = [ cfg.package ]; | ||
|
|
||
| programs = { | ||
| git = { |
Contributor
There was a problem hiding this comment.
This should be gates behind an option, see #8794 as an example of making that change in the mergiraf module.
Contributor
Author
There was a problem hiding this comment.
I have gated the git config behind a enableGitIntegration option
kpbaks
force-pushed
the
module/programs/ec/init
branch
from
b1c18bc to
e640f9e
Compare
Adds Home Manager module for ec, a 3-way terminal native Git merge conflict resolver. The module supports: - Git integration by configuring ec as a mergetool.
kpbaks
force-pushed
the
module/programs/ec/init
branch
from
e640f9e to
fec15f1
Compare
ambroisie
approved these changes
Feb 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Adds Home Manager module for ec, a 3-way terminal native Git merge conflict resolver.
The module supports:
Checklist
Change is backwards compatible.
Code formatted with
nix fmtornix-shell -p treefmt nixfmt deadnix keep-sorted nixf-diagnose --run treefmt.Code tested through
nix run .#tests -- test-allornix-shell --pure tests -A run.all.Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
If this PR adds an exciting new feature or contains a breaking change.