aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--home/git/default.nix4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b09928b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.age binary diff=age
diff --git a/home/git/default.nix b/home/git/default.nix
index 96affa7..3e0ea08 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -26,6 +26,10 @@ in
core.whitespace = "trailing-space,space-before-tab";
color.ui = "true";
+ diff = {
+ age.textconv = "${pkgs.age}/bin/age --identity ${config.home.homeDirectory}/.age/key.txt --decrypt";
+ };
+
gpg = {
format = "ssh";
ssh.allowedSignersFile = "~/.ssh/allowed_signers";