Improve diffing for Common and Emacs Lisps

2 files changed, 14 insertions, 0 deletions

diff --git a/user/settings/development/lisp.nix b/user/settings/development/lisp.nix
index 9ad918d2..ba1bd048 100644
--- a/user/settings/development/lisp.nix
+++ b/user/settings/development/lisp.nix
@@ -9,4 +9,11 @@
     asdf
     cl-launch
   ];
+
+  programs.git.attributes = [
+    "*.lisp diff=common-lisp"
+  ];
+  programs.git.extraConfig."diff.common-lisp" = {
+    xfuncname = "^\\((def\\S+\\s+\\S+)";
+  };
 }
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 2871173c..92ba39e2 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -27,6 +27,13 @@ in
     ../modules/eshell.nix
   ];
 
+  programs.git.attributes = [
+    "*.el diff=elisp"
+  ];
+  programs.git.extraConfig."diff.elisp" = {
+    xfuncname = "^\\((((def\\S+)|use-package)\\s+\\S+)";
+  };
+
   programs.emacs = {
     enable = true;
     package = lib.mkDefault (pkgs.emacs29.override { withGTK3 = true; });