nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

git: extraConfig -> settings

Browse source 
Remove string support and convert to rfc42 settings option

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman 2025-10-18 10:43:20 -05:00
parent 85cd07b8b0
commit ac7c05a90c
10 changed files with 17 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/programs/git.nix
View file

@ -111,8 +111,8 @@ in
};
};
extraConfig = mkOption {
type = types.either types.lines gitIniType;
settings = mkOption {
type = gitIniType;
default = { };
example = {
core = {
@ -121,8 +121,8 @@ in
url."ssh://git@host".insteadOf = "otherhost";
};
description = ''
Additional configuration to add. The use of string values is
deprecated and will be removed in the future.
Configuration written to {file}`$XDG_CONFIG_HOME/git/config`.
See {manpage}`git-config(1)` for details.
'';
};
@ -440,20 +440,8 @@ in
(mkIf (cfg.aliases != { }) { programs.git.iniContent.alias = cfg.aliases; })
(mkIf (lib.isAttrs cfg.extraConfig) {
programs.git.iniContent = cfg.extraConfig;
})
(mkIf (lib.isString cfg.extraConfig) {
warnings = [
''
Using programs.git.extraConfig as a string option is
deprecated and will be removed in the future. Please
change to using it as an attribute set instead.
''
];
xdg.configFile."git/config".text = cfg.extraConfig;
(mkIf (cfg.settings != { }) {
programs.git.iniContent = cfg.settings;
})
(mkIf (cfg.includes != [ ]) {