From 89fd5abd885d10d3f222778d3bec4d67b363d07f Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 18 Sep 2023 12:45:18 +0200 Subject: [PATCH] feat: use delta as git pager (for diff we still have difft) --- users/myuser/git.nix | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/users/myuser/git.nix b/users/myuser/git.nix index a2e4654..db03adb 100644 --- a/users/myuser/git.nix +++ b/users/myuser/git.nix @@ -1,12 +1,32 @@ -{lib, ...}: { - # TODO use git-fuzzy. - # TODO integrate git-fuzzy and difft +{ + lib, + pkgs, + ... +}: { + home.packages = with pkgs; [ + git-filter-repo + git-fuzzy + ]; + programs.gitui.enable = true; programs.git = { enable = true; - difftastic.enable = true; + difftastic = { + enable = true; + background = "dark"; + }; lfs.enable = lib.mkDefault false; extraConfig = { + core.pager = "${pkgs.delta}/bin/delta"; + delta = { + hyperlinks = true; + keep-plus-minus-markers = true; + line-numbers = true; + navigate = true; + side-by-side = true; + syntax-theme = "TwoDark"; + tabs = 4; + }; difftool.prompt = true; init.defaultBranch = "main"; merge.conflictstyle = "diff3";