From e2d5090e29ae0203ec40908b33af6fb193f16f8e Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@cock.li>
Date: Sun, 3 Mar 2024 01:45:09 +0100
Subject: [PATCH] switch from includes to extraConfig in git module

Xddddddddddd
---
 modules/cli/git.nix | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/cli/git.nix b/modules/cli/git.nix
index b63a8aaf..6eb017fd 100644
--- a/modules/cli/git.nix
+++ b/modules/cli/git.nix
@@ -41,25 +41,23 @@ in {
                     key = cfg.signingKey;
                     signByDefault = true;
                 };
-                includes = [
-                    {
-                        contents = {
-                            core = {
-                                editor = cfg.editor;
-                                pager = "${pkgs.delta}/bin/delta";
-                            };
-                            init.defaultBranch = cfg.defaultBranch;
-                            push.autoSetupRemote = true;
-                            commit.verbose = true;
-                            merge.conflictstyle = "zdiff3";
-                            interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-                            diff.algorithm = "histogram";
-                            transfer.fsckobjects = true;
-                            fetch.fsckobjects = true;
-                            receive.fsckobjects = true;
+                extraConfig = {
+                    contents = {
+                        core = {
+                            editor = cfg.editor;
+                            pager = "${pkgs.delta}/bin/delta";
                         };
-                    }
-                ];
+                        init.defaultBranch = cfg.defaultBranch;
+                        push.autoSetupRemote = true;
+                        commit.verbose = true;
+                        merge.conflictstyle = "zdiff3";
+                        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+                        diff.algorithm = "histogram";
+                        transfer.fsckobjects = true;
+                        fetch.fsckobjects = true;
+                        receive.fsckobjects = true;
+                    };
+                };
             };
         };
     };