colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

git: ship difftastic as a standalone program

Browse Source
This commit is contained in:
Colin
2025-07-21 23:49:23 +00:00
parent 58b87e32e3
commit 1411add8ba
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/assorted.nix
View File

@@ -517,6 +517,8 @@ in
# auth token, preferences # auth token, preferences
delfin.persist.byStore.private = [ ".config/delfin" ]; delfin.persist.byStore.private = [ ".config/delfin" ];
difftastic.sandbox.autodetectCliPaths = "existing";
dig.sandbox.net = "all"; dig.sandbox.net = "all";
dmidecode.sandbox.extraPaths = [ "/sys/firmware/dmi" ]; dmidecode.sandbox.extraPaths = [ "/sys/firmware/dmi" ];

3
hosts/common/programs/git.nix
View File

@@ -19,6 +19,7 @@ in
''; '';
}); });
suggestedPrograms = [ suggestedPrograms = [
"difftastic"
"ssh" "ssh"
]; ];
sandbox.net = "clearnet"; sandbox.net = "clearnet";
@@ -57,7 +58,7 @@ in
# - <https://difftastic.wilfred.me.uk/git.html> # - <https://difftastic.wilfred.me.uk/git.html>
diff.tool = "difftastic"; diff.tool = "difftastic";
difftool.prompt = false; difftool.prompt = false;
"difftool \"difftastic\"".cmd = ''${lib.getExe pkgs.difftastic} "$LOCAL" "$REMOTE"''; "difftool \"difftastic\"".cmd = ''difft "$LOCAL" "$REMOTE"'';
# now run `git difftool` to use difftastic git # now run `git difftool` to use difftastic git
# render dates as YYYY-MM-DD HH:MM:SS +TZ # render dates as YYYY-MM-DD HH:MM:SS +TZ