From 8694df0f9b93486fb266731370f7dd3407b2e006 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Sat, 8 Nov 2025 12:40:58 +0100
Subject: [PATCH] treewide: Adapt to git module changes

---
 hostconfig/ZeNixComputa/hm.nix   |  4 ++--
 hostconfig/ZeNixLaptop/hm.nix    |  4 ++--
 hostconfig/gandalf/hm.nix        |  4 ++--
 hostconfig/thinkpad-nixos/hm.nix |  4 ++--
 minimal/hm.nix                   | 22 +++++++++++-----------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/hostconfig/ZeNixComputa/hm.nix b/hostconfig/ZeNixComputa/hm.nix
index 31f325d..43a036b 100644
--- a/hostconfig/ZeNixComputa/hm.nix
+++ b/hostconfig/ZeNixComputa/hm.nix
@@ -4,8 +4,8 @@
   home.homeDirectory = "/home/${config.extraInfo.username}";
 
   programs.git = {
-    userName = "traxys";
-    userEmail = config.extraInfo.email;
+    settings.user.name = "traxys";
+    settings.user.email = config.extraInfo.email;
   };
 
   home.packages = with pkgs; [
diff --git a/hostconfig/ZeNixLaptop/hm.nix b/hostconfig/ZeNixLaptop/hm.nix
index 10456f7..118c72e 100644
--- a/hostconfig/ZeNixLaptop/hm.nix
+++ b/hostconfig/ZeNixLaptop/hm.nix
@@ -1,8 +1,8 @@
 { config, ... }:
 {
   programs.git = {
-    userName = "traxys";
-    userEmail = config.extraInfo.email;
+    settings.user.name = "traxys";
+    settings.user.email = config.extraInfo.email;
   };
 
   traxys.waybar.modules."battery".enable = true;
diff --git a/hostconfig/gandalf/hm.nix b/hostconfig/gandalf/hm.nix
index be8c200..558ea93 100644
--- a/hostconfig/gandalf/hm.nix
+++ b/hostconfig/gandalf/hm.nix
@@ -6,8 +6,8 @@
 }:
 {
   programs.git = {
-    userName = "Quentin Boyer";
-    userEmail = config.extraInfo.email;
+    settings.user.name = "Quentin Boyer";
+    settings.user.email = config.extraInfo.email;
   };
 
   systemd.user.services = {
diff --git a/hostconfig/thinkpad-nixos/hm.nix b/hostconfig/thinkpad-nixos/hm.nix
index 9f553e6..69c943d 100644
--- a/hostconfig/thinkpad-nixos/hm.nix
+++ b/hostconfig/thinkpad-nixos/hm.nix
@@ -78,8 +78,8 @@ in
   ];
 
   programs.git = {
-    userName = "Quentin Boyer";
-    userEmail = config.workAddr;
+    settings.user.name = "Quentin Boyer";
+    settings.user.email = config.workAddr;
     includes = [
       {
         condition = "gitdir:~/Perso/";
diff --git a/minimal/hm.nix b/minimal/hm.nix
index 567b3dc..506952d 100644
--- a/minimal/hm.nix
+++ b/minimal/hm.nix
@@ -139,7 +139,7 @@
         compile_commands.json
       '';
 
-      extraConfig = {
+      settings = {
         sendemail = {
           composeEncoding = "utf-8";
         };
@@ -167,17 +167,17 @@
           untrackedCache = true;
           commitGraph = true;
         };
-      };
 
-      aliases = {
-        fpush = "push --force-with-lease";
-        ri = "rebase -i";
-        fix = "commit --fixup";
-        amend = "commit --amend";
-        rib = "!git ri $(git bb) $@";
-        bb = "config --local --default master custom.base-branch";
-        set-bb = "config --local custom.base-branch";
-        rv = ''!sh -c 'git commit --amend --no-edit --trailer "Reviewed-by: $*"' - '';
+        alias = {
+          fpush = "push --force-with-lease";
+          ri = "rebase -i";
+          fix = "commit --fixup";
+          amend = "commit --amend";
+          rib = "!git ri $(git bb) $@";
+          bb = "config --local --default master custom.base-branch";
+          set-bb = "config --local custom.base-branch";
+          rv = ''!sh -c 'git commit --amend --no-edit --trailer "Reviewed-by: $*"' - '';
+        };
       };
     };