From 1a2071c596e26a18bd3236e83c4c1069b895e41b Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 8 Dec 2023 11:36:21 -0500 Subject: [PATCH] feat(git): support diffing bun lockfiles --- user/modules/dev.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/user/modules/dev.nix b/user/modules/dev.nix index c1b5231..63203e1 100644 --- a/user/modules/dev.nix +++ b/user/modules/dev.nix @@ -24,6 +24,7 @@ extensions = ["rust-src"]; }) ]; + programs.zsh.initExtra = '' export PATH=~/.npm-packages/bin:$PATH export NODE_PATH=~/.npm-packages/lib/node_modules @@ -32,4 +33,15 @@ programs.direnv = { enable = true; }; + + # Bun Git config + programs.git = { + attributes = [ + "*.lockb binary diff=lockb" + ]; + extraConfig = { + diff.lockb.textconv = "bun"; + diff.lockb.binary = "true"; + }; + }; }