From d7424a4cb6a8134812c829cc39dd77268e90e6a7 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Wed, 3 Dec 2025 09:57:52 +0100
Subject: [PATCH] feat(nixos): refactor Git and GUI configuration handling

- Replaced `inherit` with explicit `settings` for Git user configuration.
- Unified Git configuration structure across NixOS and home modules.
- Adjusted GUI configuration by enabling `gdm.autoSuspend` and reordering options.
---
 modules/home/tools/git/default.nix     | 7 +++++--
 modules/nixos/services/gui/default.nix | 7 ++++---
 modules/nixos/tools/git/default.nix    | 7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 3afe689..7510d08 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -31,13 +31,16 @@ in
     ];
     programs.git = {
       enable = true;
-      inherit (cfg) userName userEmail;
       lfs = enabled;
       signing = {
         key = cfg.signingKey;
         inherit (cfg) signByDefault;
       };
-      extraConfig = {
+      settings = {
+        user = {
+          email = cfg.userEmail;
+          name = cfg.userName;
+        };
         init = {
           defaultBranch = "main";
         };
diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 5a48528..5226815 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -48,11 +48,13 @@ in
         pkgs.yubikey-personalization
       ];
 
+      displayManager.gdm.enable = true;
+      displayManager.gdm.autoSuspend = false;
+      desktopManager.gnome.enable = true;
+
       xserver = {
         xkb.layout = lib.mkDefault "de+us";
         enable = true;
-        displayManager.gdm.enable = true;
-        desktopManager.gnome.enable = true;
       };
     };
     #security.pam.p11.control = "sufficient";
@@ -209,6 +211,5 @@ in
     services.xrdp.enable = true;
     services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
     services.xrdp.openFirewall = true;
-    services.xserver.displayManager.gdm.autoSuspend = false;
   };
 }
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index 932f69a..9a79098 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -26,13 +26,16 @@ in
     metacfg.home.extraOptions = {
       programs.git = {
         enable = true;
-        inherit (cfg) userName userEmail;
         lfs = enabled;
         signing = {
           key = cfg.signingKey;
           signByDefault = mkIf gpg.enable true;
         };
-        extraConfig = {
+        settings = {
+          user = {
+            email = cfg.userEmail;
+            name = cfg.userName;
+          };
           init = {
             defaultBranch = "main";
           };