From 1707de36c295673364541bf5514ae01308270f9e Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Wed, 31 Jul 2024 11:55:03 +0200
Subject: [PATCH] pkgs/git-diff-word: Add git shortcut to diff by character

---
 flake.nix                           | 1 +
 pkgs/git-diff-word/default.nix      | 9 +++++++++
 pkgs/git-diff-word/git-diff-word.sh | 5 +++++
 pkgs/overlay.nix                    | 1 +
 4 files changed, 16 insertions(+)
 create mode 100644 pkgs/git-diff-word/default.nix
 create mode 100755 pkgs/git-diff-word/git-diff-word.sh

diff --git a/flake.nix b/flake.nix
index d15cd4d..6264dd4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -123,6 +123,7 @@
         clerie-sops-edit
         chromium-incognito
         git-checkout-github-pr
+        git-diff-word
         iot-data
         nix-remove-result-links
         nixfiles-auto-install
diff --git a/pkgs/git-diff-word/default.nix b/pkgs/git-diff-word/default.nix
new file mode 100644
index 0000000..b80d25d
--- /dev/null
+++ b/pkgs/git-diff-word/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+pkgs.writeShellApplication {
+  name = "git-diff-word";
+  text = builtins.readFile ./git-diff-word.sh;
+  runtimeInputs = with pkgs; [
+    git
+  ];
+}
diff --git a/pkgs/git-diff-word/git-diff-word.sh b/pkgs/git-diff-word/git-diff-word.sh
new file mode 100755
index 0000000..3cbb914
--- /dev/null
+++ b/pkgs/git-diff-word/git-diff-word.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+git diff --word-diff=color --word-diff-regex="." "$@"
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 1ccd9c7..9f24963 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -8,6 +8,7 @@ final: prev: {
   clerie-update-nixfiles = final.callPackage ./clerie-update-nixfiles/clerie-update-nixfiles.nix {};
   chromium-incognito = final.callPackage ./chromium-incognito {};
   git-checkout-github-pr = final.callPackage ./git-checkout-github-pr {};
+  git-diff-word = final.callPackage ./git-diff-word {};
   iot-data = final.python3.pkgs.callPackage ./iot-data {};
   nix-remove-result-links = final.callPackage ./nix-remove-result-links {};
   nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};