From bcc3ba0aee4865c4ccc4b810f4392d0f2dbf6891 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 17 Nov 2024 13:49:28 +0100
Subject: [PATCH] Add additional git config

---
 modules/programs/git.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 2e78f4c..f409106 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -18,6 +18,22 @@
       type = lib.types.str;
       description = "Git email";
     };
+    additionalConfig = lib.mkOption {
+      default = {
+        merge = {
+          tool = "nvimdiff";
+        };
+        diff = {
+          tool = "nvimdiff";
+        };
+        pull.rebase = true;
+      };
+      example = {
+        pull.rebase = false;
+      };
+      type = with lib.types; attrsOf anything;
+      description = "Additional git config";
+    };
     sshConfig = lib.mkOption {
       default = ''
         Host github.com
@@ -53,14 +69,7 @@
         enable = true;
         userName = config.mods.git.username;
         userEmail = config.mods.git.email;
-        extraConfig = {
-          merge = {
-            tool = "nvimdiff";
-          };
-          diff = {
-            tool = "nvimdiff";
-          };
-        };
+        extraConfig = config.mods.git.additionalConfig;
       };
       home.file.".ssh/config".text = config.mods.git.sshConfig;
     }