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 home-manager module for delta

Browse source
This commit is contained in:
Sridhar Ratnakumar 2023-07-16 12:53:41 -04:00
parent ffb5e3f8ed
commit a9407f1e0d
2 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
home/git.nix
View file

@ -1,7 +1,5 @@
{ pkgs, config, flake, ... }:
{
imports = [ ./git_delta.nix ];
home.packages = [ pkgs.git-lfs ];
programs.git = {
@ -20,6 +18,15 @@
pu = "push";
};
ignores = [ "*~" "*.swp" ];
delta = {
enable = true;
options = {
features = "decorations";
navigate = true;
light = false;
side-by-side = true;
};
};
extraConfig = {
init.defaultBranch = "master"; # https://srid.ca/unwoke
core.editor = "nvim";

18
home/git_delta.nix
View file

@ -1,18 +0,0 @@
{ 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";
};
}