From 575c416d97b3dd9ff3759d0376fa2ddcd9c0b9f5 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 21 Feb 2025 16:41:54 +0000
Subject: [PATCH] home: git: use 'mkAfter' for local config include

This should ensure that it will be included at the very end of the
configuration, allowing it to override any other options in the file.

Not sure that I _really_ need it, but it's tidier this way.
---
 modules/home/git/default.nix | 44 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index fcab9c3..98361ad 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -134,30 +134,34 @@ in
       };
     };
 
-    includes = [
+    includes = lib.mkMerge [
       # Multiple identities
-      {
-        condition = "gitdir:~/git/EPITA/";
-        contents = {
-          user = {
-            name = "Bruno BELANYI";
-            email = mkMailAddress "bruno.belanyi" "epita.fr";
+      [
+        {
+          condition = "gitdir:~/git/EPITA/";
+          contents = {
+            user = {
+              name = "Bruno BELANYI";
+              email = mkMailAddress "bruno.belanyi" "epita.fr";
+            };
           };
-        };
-      }
-      {
-        condition = "gitdir:~/git/work/";
-        contents = {
-          user = {
-            name = "Bruno BELANYI";
-            email = mkMailAddress "ambroisie" "google.com";
+        }
+        {
+          condition = "gitdir:~/git/work/";
+          contents = {
+            user = {
+              name = "Bruno BELANYI";
+              email = mkMailAddress "ambroisie" "google.com";
+            };
           };
-        };
-      }
+        }
+      ]
       # Local configuration, not-versioned
-      {
-        path = "config.local";
-      }
+      (lib.mkAfter [
+        {
+          path = "config.local";
+        }
+      ])
     ];
 
     ignores =