djm
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve elisp and clojure diffs

This commit is contained in:
David Morgan 2023-01-12 12:12:07 +00:00
parent a6ebfc0dbb
commit 5371b56438
Signed by: djm
GPG Key ID: C171251002C200F2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix-conf/home/includes/common.nix
View File

@ -207,11 +207,17 @@ in
update-master = "!git fetch origin master:master"; update-master = "!git fetch origin master:master";
update-main = "!git fetch origin main:main"; update-main = "!git fetch origin main:main";
}; };
attributes = [
"*.el diff=elisp"
"*.clj diff=clojure"
];
extraConfig = { extraConfig = {
core.editor = "vim"; core.editor = "vim";
diff = { diff = {
tool = "difftastic"; tool = "difftastic";
colorMoved = "default"; colorMoved = "default";
elisp = { xfuncname = "^\\((((def\\S+)|use-package)\\s+\\S+)"; };
clojure = { xfuncname = "^\\((def\\S+\\s+\\S+)"; };
}; };
difftool = { difftool = {
prompt = false; prompt = false;