mirror of
https://github.com/Theaninova/TheaninovOS.git
synced 2025-12-12 11:36:20 +00:00
27 lines
624 B
Nix
27 lines
624 B
Nix
{ ... }:
|
|
{
|
|
programs.git = {
|
|
enable = true;
|
|
userName = "Thea Schöbl";
|
|
userEmail = "dev@theaninova.de";
|
|
signing = {
|
|
key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
|
|
signByDefault = true;
|
|
};
|
|
extraConfig = {
|
|
pull.rebase = true;
|
|
init.defaultBranch = "main";
|
|
merge = {
|
|
tool = "nvim-mergetool";
|
|
conflictstyle = "diff3";
|
|
};
|
|
mergetool.nvim-mergetool = {
|
|
cmd = # sh
|
|
''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'';
|
|
trustExitCode = true;
|
|
};
|
|
mergetool.prompt = false;
|
|
};
|
|
};
|
|
}
|