From e6461cfd9b1e0bda60c16db20afa0aa81a110294 Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@cock.li>
Date: Sun, 3 Mar 2024 09:40:34 +0100
Subject: [PATCH] oh my god this is so fucking stupid

I moved from `includes` to `extraConfig` and didn't remove the
`contents` that explains EVERYTHING

it doesn't explain why I'm this retarded though

followed this btw https://code.mendhak.com/keepassxc-sign-git-commit-with-ssh/

big shoutout to mendhak :-)
---
 modules/cli/git.nix | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/modules/cli/git.nix b/modules/cli/git.nix
index 8fc757ab..d462896f 100644
--- a/modules/cli/git.nix
+++ b/modules/cli/git.nix
@@ -38,26 +38,24 @@ in {
             programs.git = {
                 inherit (cfg) enable userName userEmail;
                 extraConfig = {
-                    contents = {
-                        core = {
-                            editor = cfg.editor;
-                            pager = "${pkgs.delta}/bin/delta";
-                        };
-                        init.defaultBranch = cfg.defaultBranch;
-                        push.autoSetupRemote = true;
-                        commit = {
-                            verbose = true;
-                            gpgSign = true;
-                        };
-                        gpg.format = "ssh";
-                        user.signingKey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB";
-                        merge.conflictstyle = "zdiff3";
-                        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-                        diff.algorithm = "histogram";
-                        transfer.fsckobjects = true;
-                        fetch.fsckobjects = true;
-                        receive.fsckobjects = true;
+                    core = {
+                        editor = cfg.editor;
+                        pager = "${pkgs.delta}/bin/delta";
                     };
+                    init.defaultBranch = cfg.defaultBranch;
+                    push.autoSetupRemote = true;
+                    commit = {
+                        verbose = true;
+                        gpgsign = true;
+                    };
+                    gpg.format = "ssh";
+                    user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB";
+                    merge.conflictstyle = "zdiff3";
+                    interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+                    diff.algorithm = "histogram";
+                    transfer.fsckobjects = true;
+                    fetch.fsckobjects = true;
+                    receive.fsckobjects = true;
                 };
             };
         };