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:
parent
9f792774a5
commit
d7424a4cb6
3 changed files with 14 additions and 7 deletions
|
|
@ -31,13 +31,16 @@ in
|
||||||
];
|
];
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit (cfg) userName userEmail;
|
|
||||||
lfs = enabled;
|
lfs = enabled;
|
||||||
signing = {
|
signing = {
|
||||||
key = cfg.signingKey;
|
key = cfg.signingKey;
|
||||||
inherit (cfg) signByDefault;
|
inherit (cfg) signByDefault;
|
||||||
};
|
};
|
||||||
extraConfig = {
|
settings = {
|
||||||
|
user = {
|
||||||
|
email = cfg.userEmail;
|
||||||
|
name = cfg.userName;
|
||||||
|
};
|
||||||
init = {
|
init = {
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -48,11 +48,13 @@ in
|
||||||
pkgs.yubikey-personalization
|
pkgs.yubikey-personalization
|
||||||
];
|
];
|
||||||
|
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
|
displayManager.gdm.autoSuspend = false;
|
||||||
|
desktopManager.gnome.enable = true;
|
||||||
|
|
||||||
xserver = {
|
xserver = {
|
||||||
xkb.layout = lib.mkDefault "de+us";
|
xkb.layout = lib.mkDefault "de+us";
|
||||||
enable = true;
|
enable = true;
|
||||||
displayManager.gdm.enable = true;
|
|
||||||
desktopManager.gnome.enable = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
#security.pam.p11.control = "sufficient";
|
#security.pam.p11.control = "sufficient";
|
||||||
|
|
@ -209,6 +211,5 @@ in
|
||||||
services.xrdp.enable = true;
|
services.xrdp.enable = true;
|
||||||
services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
|
services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
|
||||||
services.xrdp.openFirewall = true;
|
services.xrdp.openFirewall = true;
|
||||||
services.xserver.displayManager.gdm.autoSuspend = false;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,13 +26,16 @@ in
|
||||||
metacfg.home.extraOptions = {
|
metacfg.home.extraOptions = {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit (cfg) userName userEmail;
|
|
||||||
lfs = enabled;
|
lfs = enabled;
|
||||||
signing = {
|
signing = {
|
||||||
key = cfg.signingKey;
|
key = cfg.signingKey;
|
||||||
signByDefault = mkIf gpg.enable true;
|
signByDefault = mkIf gpg.enable true;
|
||||||
};
|
};
|
||||||
extraConfig = {
|
settings = {
|
||||||
|
user = {
|
||||||
|
email = cfg.userEmail;
|
||||||
|
name = cfg.userName;
|
||||||
|
};
|
||||||
init = {
|
init = {
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue