From a98194c8b6664d91f9d7e429c35a83850eb3a688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 25 Jul 2020 11:07:16 +0100 Subject: [PATCH] use diff-so-fancy only at the point of execution --- nixos/home-manager/cli.nix | 1 - nixos/home-manager/programs/git.nix | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix index a993f3c2..145d81ab 100644 --- a/nixos/home-manager/cli.nix +++ b/nixos/home-manager/cli.nix @@ -16,7 +16,6 @@ fontconfig genpass git - gitAndTools.diff-so-fancy gnupg hsetroot htop diff --git a/nixos/home-manager/programs/git.nix b/nixos/home-manager/programs/git.nix index dfcfb838..01c382f4 100644 --- a/nixos/home-manager/programs/git.nix +++ b/nixos/home-manager/programs/git.nix @@ -9,8 +9,8 @@ credential = { helper ="cache"; }; core = { pager = "cat"; }; pager = { - diff = "diff-so-fancy | less --tabs=1,5 -RFX"; - show = "diff-so-fancy | less --tabs=1,5 -RFX"; + diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX"; + show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX"; }; }; aliases =