From 5371b5643877c9348bc2abe21759ecf8e475596e Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 12 Jan 2023 12:12:07 +0000 Subject: [PATCH] Improve elisp and clojure diffs --- nix-conf/home/includes/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix index 875dfc8..675a707 100644 --- a/nix-conf/home/includes/common.nix +++ b/nix-conf/home/includes/common.nix @@ -207,11 +207,17 @@ in update-master = "!git fetch origin master:master"; update-main = "!git fetch origin main:main"; }; + attributes = [ + "*.el diff=elisp" + "*.clj diff=clojure" + ]; extraConfig = { core.editor = "vim"; diff = { tool = "difftastic"; colorMoved = "default"; + elisp = { xfuncname = "^\\((((def\\S+)|use-package)\\s+\\S+)"; }; + clojure = { xfuncname = "^\\((def\\S+\\s+\\S+)"; }; }; difftool = { prompt = false;