git.nix: add difftastic as a git tool
This commit is contained in:
parent
bb0cca953f
commit
1a15a9e83f
1 changed files with 3 additions and 3 deletions
|
@ -1,10 +1,9 @@
|
||||||
{
|
{
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
inherit (config.modules.other.system) username;
|
|
||||||
in {
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
|
@ -20,6 +19,7 @@ in {
|
||||||
pull.ff = "only";
|
pull.ff = "only";
|
||||||
gpg.format = "ssh";
|
gpg.format = "ssh";
|
||||||
commit.gpgsign = "true";
|
commit.gpgsign = "true";
|
||||||
|
diff.external = "${pkgs.difftastic}/bin/difft";
|
||||||
rebase = {
|
rebase = {
|
||||||
autoSquash = true;
|
autoSquash = true;
|
||||||
autoStash = true;
|
autoStash = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue