From d56d339de779cf9933e8804ded717ac5b3175d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nrabulinski@antmicro.com>
Date: Fri, 1 Nov 2024 13:07:01 +0100
Subject: [PATCH] pkgs: git-fixup

---
 flake.nix                 |  1 +
 pkgs/default.nix          | 12 +++++++++++-
 wrappers/fish/config.fish |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 8074a55..f139495 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,6 +47,7 @@
                 helix
                 fish
                 git-commit-last
+                git-fixup
               ];
             };
           };
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 02ac33c..97b92d2 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,7 @@
 { inputs, ... }:
 {
   perSystem =
-    { pkgs, inputs', ... }:
+    { pkgs, lib, inputs', ... }:
     {
       packages.conduit-next = pkgs.callPackage ./conduit {
         src = inputs.conduit-src;
@@ -16,5 +16,15 @@
           git commit -eF "$GITDIR/COMMIT_EDITMSG"
         '';
       };
+
+      packages.git-fixup = pkgs.writeShellApplication {
+        name = "git-fixup";
+        text = ''
+          git log -n 50 --pretty=format:'%h %s' --no-merges | \
+          ${lib.getExe pkgs.fzf} | \
+          cut -c -7 | \
+          xargs -o git commit --fixup
+        '';
+      };
     };
 }
diff --git a/wrappers/fish/config.fish b/wrappers/fish/config.fish
index a188277..6a81d72 100644
--- a/wrappers/fish/config.fish
+++ b/wrappers/fish/config.fish
@@ -23,6 +23,7 @@ and begin
     abbr --add --global -- gd 'git diff'
     abbr --add --global -- gdd 'git diff --cached'
     abbr --add --global -- gl 'git log'
+    abbr --add --global -- gf 'git fixup' # See pkgs/default.nix
 
     # Aliases
     alias cat bat