mirror of
https://github.com/nix-community/home-manager.git
synced 2025-03-31 04:04:32 +00:00
d8b4ba070f
This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.
13 lines
298 B
Nix
13 lines
298 B
Nix
{ config, lib, ... }:
|
|
|
|
{
|
|
programs.git.enable = true;
|
|
programs.mergiraf.enable = true;
|
|
|
|
nmt.script = ''
|
|
assertFileContent "home-files/.config/git/config" ${./mergiraf-git.conf}
|
|
assertFileContent "home-files/.config/git/attributes" ${
|
|
./mergiraf-git-attributes.conf
|
|
}
|
|
'';
|
|
}
|