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.
This commit is contained in:
Harald Hoyer 2025-12-03 09:57:52 +01:00
parent 9f792774a5
commit d7424a4cb6
3 changed files with 14 additions and 7 deletions

View file

@ -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";
};

View file

@ -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;
};
}

View file

@ -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";
};