From 761adc3133294ab3cf2d5d75cb316638ee69aff1 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 18 Sep 2023 16:11:44 +0200
Subject: [PATCH] fix: more config options for git fuzzy

---
 pkgs/git-fuzzy/default.nix | 24 ++++++++++++++++++------
 users/myuser/git.nix       | 12 ++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/git-fuzzy/default.nix b/pkgs/git-fuzzy/default.nix
index 5695ad3..954575f 100644
--- a/pkgs/git-fuzzy/default.nix
+++ b/pkgs/git-fuzzy/default.nix
@@ -4,10 +4,11 @@
   lib,
   makeWrapper,
   gitAndTools,
+  bc,
   bat,
   extraPackages ? [],
 }: let
-  binPath = lib.makeBinPath ([gitAndTools.hub gitAndTools.delta bat] ++ extraPackages);
+  binPath = lib.makeBinPath ([gitAndTools.hub gitAndTools.delta bc bat] ++ extraPackages);
 in
   stdenvNoCC.mkDerivation rec {
     pname = "git-fuzzy";
@@ -24,12 +25,24 @@ in
     ];
 
     postPatch = ''
-      for GF_key in $(grep -o -- 'GF_[A-Z0-9_]*' lib/load-configs.sh | sort -u); do
+      for GF_key in $(grep -ohr -- 'GF_[A-Z0-9_]*' lib | sort -u); do
       key=''${GF_key#"GF_"}
+      key=''${key//_/-}
       key=''${key,,}
       cat >> lib/load-configs-from-git.sh <<EOF
       if val=\$(git config --get fuzzy.''${key@Q}); then
-        $GF_key=\$val
+        export $GF_key=\$val
+      fi
+      EOF
+      done
+
+      for GIT_FUZZY_key in $(grep -ohr -- 'GIT_FUZZY_[A-Z0-9_]*' lib | sort -u); do
+      key=''${GIT_FUZZY_key#"GIT_FUZZY_"}
+      key=''${key//_/-}
+      key=''${key,,}
+      cat >> lib/load-configs-from-git.sh <<EOF
+      if val=\$(git config --get fuzzy.''${key@Q}); then
+        export $GIT_FUZZY_key=\$val
       fi
       EOF
       done
@@ -38,12 +51,11 @@ in
     nativeBuildInputs = [makeWrapper];
     installPhase = ''
       install -m755 -D ./bin/git-fuzzy $out/bin/git-fuzzy
-      install -d "$out/lib"
-      cp -r lib "$out/lib/git-fuzzy"
+      cp -r lib "$out/lib"
     '';
 
     postFixup = ''
-      sed -i 's%lib_dir="$script_dir/../lib"%lib_dir='"$out"'/lib/git-fuzzy%' $out/bin/git-fuzzy
+      sed -i 's%git_fuzzy_dir="$script_dir/.."%git_fuzzy_dir='"$out"'%' $out/bin/git-fuzzy
       wrapProgram "$out/bin/git-fuzzy" --prefix PATH : ${binPath}
     '';
 
diff --git a/users/myuser/git.nix b/users/myuser/git.nix
index db03adb..dba5e1d 100644
--- a/users/myuser/git.nix
+++ b/users/myuser/git.nix
@@ -27,6 +27,18 @@
         syntax-theme = "TwoDark";
         tabs = 4;
       };
+      fuzzy = {
+        bat-theme = "TwoDark";
+        # TODO fuzzy is bad, it hardcodes diff | pager exec style.
+        # This needs to be patched so we can use difft. alternative:
+        # don't use a pager in fuzzy and somehow make difft width available to the main git diff command
+        #preferred-pager = let
+        #  wrapper = pkgs.writeShellScript "difft-for-fuzzy" ''
+        #    ${pkgs.difftastic}/bin/difft --color=always --width "$1"
+        #  '');
+        #in "${wrapper} __WIDTH__";
+        status-directory-preview-command = "ls -lahF --group-directories-first --show-control-chars --quoting-style=escape --color=always";
+      };
       difftool.prompt = true;
       init.defaultBranch = "main";
       merge.conflictstyle = "diff3";