🔍

Enzime · Dec 20, 2023 · bf12162 · bf12162
1 parent 8c56e4b
commit bf12162
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Added `diff.age.textconv` to support `git diff` on `.age` files
 - Use `enzime` key instead of `enzime_*`
 - Readded `agenix` `zsh` function
 - Added `captive-browser` on laptops

diff --git a/modules/base.nix b/modules/base.nix
@@ -175,8 +175,22 @@ in {
         extraConfig = {
           advice = { addIgnoredFile = false; };
           am = { threeWay = true; };
-          core = { hooksPath = "~/.config/git/hooks"; };
-          diff = { colorMoved = "default"; };
+          core = {
+            attributesfile = "${pkgs.writeText "attributesfile" ''
+              *.age diff=age
+            ''}";
+            hooksPath = "~/.config/git/hooks";
+          };
+          diff = {
+            colorMoved = "default";
+            age.textconv = "${lib.getExe (pkgs.writeShellApplication {
+              name = "age-textconv";
+              runtimeInputs = [ pkgs.age ];
+              text = ''
+                age --decrypt -i <(op read "op://trimcmujfu5fjcx5u4u752yk2i/6gedf3cheamokyw47sq4wbxlsy/private key?ssh-format=openssh") "$1"
+              '';
+            })}";
+          };
           fetch = { prune = true; };
           init = { defaultBranch = "main"; };
           merge = { conflictStyle = "zdiff3"; };

diff --git a/secrets/zshrc_phi.age b/secrets/zshrc_phi.age