From 69f40fc923dbe85c2e3d36347246b9b2d319e044 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 11 Mar 2024 11:23:18 +0000 Subject: [PATCH] Enable git diff GPG encrypted files --- home/git/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/home/git/default.nix b/home/git/default.nix index 65d73808..60f3b223 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -18,6 +18,10 @@ 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 user = "pixelifytica"; in { @@ -26,7 +30,10 @@ pull.rebase = false; init.defaultBranch = "main"; merge.conflictstyle = "diff3"; - diff.colorMoved = "default"; + diff = { + colorMoved = "default"; + gpg.textconv = "gpg --no-tty --decrypt"; + }; }; }; }