From 11db2738c94ece778c13e5b2ede7617ca2ce83dc Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Tue, 2 Dec 2025 23:54:40 +0100
Subject: [PATCH] home/common: adjust git and delta config to home-manager
 changes

---
 home/common.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/home/common.nix b/home/common.nix
index 5e57d1c..afeadbf 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -43,7 +43,7 @@
 
   programs.git = {
     enable = true;
-    extraConfig = {
+    settings = {
       credential.helper = "cache";
       push.default = "simple";
       push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
@@ -75,13 +75,14 @@
       rerere.enabled = true;
     };
     lfs.enable = true;
-    delta = {
-      enable = true;
-      options = {
-        line-numbers = true;
-        side-by-side = true;
-        #dark = true;
-      };
+  };
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+    options = {
+      line-numbers = true;
+      side-by-side = true;
+      #dark = true;
     };
   };
   programs.lazygit = {