dotfiles/nixos-config
1
0
Fork 0
mirror of https://github.com/srid/nixos-config.git synced 2026-05-11 17:36:07 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

use delta as git diff view

Browse source
This commit is contained in:
Sridhar Ratnakumar 2023-07-16 11:33:23 -04:00
parent 294bca352e
commit ffb5e3f8ed
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/git.nix
View file

@ -1,5 +1,7 @@
{ pkgs, config, flake, ... }:
{
imports = [ ./git_delta.nix ];
home.packages = [ pkgs.git-lfs ];
programs.git = {

18
home/git_delta.nix Normal file
View file

@ -0,0 +1,18 @@
{ pkgs, lib, ... }:
# https://github.com/dandavison/delta#get-started
# https://dandavison.github.io/delta/configuration.html
{
programs.git.extraConfig = {
core.pager = lib.getExe pkgs.delta;
interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only --features=interactive";
delta = {
features = "decorations";
navigate = true;
light = false;
side-by-side = true;
};
merge.conflictstyle = "diff3";
diff.colorMoved = "default";
};
}