diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index a77e8be..fededfd 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -1,10 +1,6 @@ { nixosConfig, pkgs, ... }: { - home.packages = with pkgs; [ - fzf - gitAndTools.diff-so-fancy - ]; programs = { git = { enable = true; @@ -16,7 +12,7 @@ }; extraConfig = { init.defaultBranch = "main"; - core.pager = "diff-so-fancy | less --tabs=4 -RFX"; + core.pager = "${pkgs.diff-so-fancy}/bin/diff-so-fancy | less --tabs=4 -RFX"; diff.sops.textconv = "${pkgs.sops}/bin/sops -d"; pull.ff = "only"; alias.find-merge = "!sh -c 'commit=$0 && branch=\${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"; @@ -102,7 +98,7 @@ git_pick-commit_merge-base_origin_master = { description = "fuzzy find a commit hash"; body = '' - git log --oneline (git merge-base HEAD origin/master)..HEAD | fzf --preview='git show (echo {} | cut -d" " -f 1)' --preview-window=top:75% | cut -d" " -f 1 + git log --oneline (git merge-base HEAD origin/master)..HEAD | ${pkgs.fzf}/bin/fzf --preview='git show (echo {} | cut -d" " -f 1)' --preview-window=top:75% | cut -d" " -f 1 ''; }; gfix = { diff --git a/home-manager/users/jal.nix b/home-manager/users/jal.nix index 2e43704..41c3ffd 100644 --- a/home-manager/users/jal.nix +++ b/home-manager/users/jal.nix @@ -143,7 +143,6 @@ in exa gcr # required for pinentry-gnome geeqie - gitAndTools.diff-so-fancy gnupg khal lsof diff --git a/home-manager/users/jalr.nix b/home-manager/users/jalr.nix index 8a1f6bc..cf41aa6 100644 --- a/home-manager/users/jalr.nix +++ b/home-manager/users/jalr.nix @@ -65,7 +65,6 @@ exa gcr # required for pinentry-gnome geeqie - gitAndTools.diff-so-fancy gnupg khal lsof