foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-07 18:19:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

profiles/dev: add diffoscope for git difftool

Browse Source
This commit is contained in:
Gabriel Arazas 2022-10-10 11:40:19 +08:00
parent b1bc569232
commit 267df4029e
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/nixos/profiles/dev.nix
View File

@ -40,6 +40,18 @@ in {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
config.difftool.prompt = false;
# Yeah, let's use this oversized diff tool, shall we?
# Also, this config is based from this tip.
# https://lists.reproducible-builds.org/pipermail/diffoscope/2016-April/000193.html
config.difftool."diffoscope".cmd = ''
"if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE; else diffoscope $LOCAL $REMOTE; fi"
'';
config.difftool."diffoscope-html".cmd = ''
"if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE --html - | cat; else diffoscope $LOCAL $REMOTE --html - | cat; fi"
'';
}; };
programs.gnupg = { agent.enable = true; }; programs.gnupg = { agent.enable = true; };
@ -55,6 +67,7 @@ in {
cachix # Compile no more by using someone's binary cache! cachix # Compile no more by using someone's binary cache!
curl # Our favorite network client. curl # Our favorite network client.
cmake # The poster boy for the hated build system. cmake # The poster boy for the hated build system.
diffoscope # Oversized caffeine grinder.
direnv # The power of local development environment. direnv # The power of local development environment.
gcc # The usual toolchain. gcc # The usual toolchain.
gdb # The usual debugger. gdb # The usual debugger.