bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Git: better diff tool configuration

Browse source
This commit is contained in:
Filippo Berto 2023-06-22 12:17:21 +02:00
parent c746af2433
commit 8f59f0225c
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hm_modules/git.nix
View file

@ -36,6 +36,7 @@ let
"gcpa" = "git cherry-pick --abort"; "gcpa" = "git cherry-pick --abort";
"gcpc" = "git cherry-pick --continue"; "gcpc" = "git cherry-pick --continue";
"gd" = "git diff"; "gd" = "git diff";
"gdtd" = "git difftool -g --dir-diff";
"gdca" = "git diff --cached"; "gdca" = "git diff --cached";
"gdcw" = "git diff --cached --word-diff"; "gdcw" = "git diff --cached --word-diff";
"gdct" = "git describe --tags $(git rev-list --tags --max-count=1)"; "gdct" = "git describe --tags $(git rev-list --tags --max-count=1)";
@ -106,6 +107,7 @@ in
# delta.side-by-side = true; # delta.side-by-side = true;
diff.colorMoved = "default"; diff.colorMoved = "default";
diff.guitool = "meld"; diff.guitool = "meld";
diff.tool = "meld";
# init.defaultBranch = "main"; # init.defaultBranch = "main";
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";
merge.guitool = "meld"; merge.guitool = "meld";

2
odin/hm.nix
View file

@ -18,7 +18,7 @@
# signal-desktop # signal-desktop
# slack # slack
# wineFull # wineFull
arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita meld openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us; arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
inherit (pkgs.gnome) inherit (pkgs.gnome)
# geary # geary
# gnome-boxes # gnome-boxes

2
thor/hm.nix
View file

@ -19,7 +19,7 @@
# signal-desktop # signal-desktop
# slack # slack
# wineFull # wineFull
arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita meld openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us; arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
inherit (pkgs.gnome) inherit (pkgs.gnome)
# geary # geary
# gnome-boxes # gnome-boxes