From c7338f2cbc1bfcce09dbee3badfec8548934b373 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Wed, 12 Nov 2025 20:56:26 -0600
Subject: [PATCH] home/common/git | upstreams changes

---
 home/common/git.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/home/common/git.nix b/home/common/git.nix
index 43f6dc4..3617ea1 100644
--- a/home/common/git.nix
+++ b/home/common/git.nix
@@ -4,17 +4,20 @@
   ...
 }: {
   programs.lazygit = {settings = {os.editPreset = "nvim";};};
+  programs.diff-so-fancy = {
+    enable = true;
+    enableGitIntegration = true;
+  };
   programs.git = {
     enable = true;
-    aliases = {
-      co = "checkout";
-      br = "branch";
-      ci = "commit";
-      st = "status";
-      last = "cat-file commit HEAD";
-    };
-    diff-so-fancy = {enable = true;};
-    extraConfig = {
+    settings = {
+      alias = {
+        co = "checkout";
+        br = "branch";
+        ci = "commit";
+        st = "status";
+        last = "cat-file commit HEAD";
+      };
       core = {
         user = "Don Harper";
         email = "duck@duckland.org";