pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enable git diff GPG encrypted files

Browse source
This commit is contained in:
Evie Litherland-Smith 2024-03-11 11:23:18 +00:00
parent f01166c03d
commit 69f40fc923
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
home/git/default.nix
View file

@ -18,6 +18,10 @@
syntax-theme = with config.programs; lib.mkIf bat.enable bat.config.theme; syntax-theme = with config.programs; lib.mkIf bat.enable bat.config.theme;
}; };
}; };
attributes = [
"*.gpg filter=gpg diff=gpg"
"*.asc filter=gpg diff=gpg"
];
extraConfig = let extraConfig = let
user = "pixelifytica"; user = "pixelifytica";
in { in {
@ -26,7 +30,10 @@
pull.rebase = false; pull.rebase = false;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";
diff.colorMoved = "default"; diff = {
colorMoved = "default";
gpg.textconv = "gpg --no-tty --decrypt";
};
}; };
}; };
} }