nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 11:36:05 +01:00
Code Activity

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

2
modules/programs/bun.nix
View file

@ -64,7 +64,7 @@ in
programs.git.attributes = lib.mkIf (cfg.enableGitIntegration && (cfg.package != null)) [
"*.lockb binary diff=lockb"
];
programs.git.extraConfig.diff.lockb = lib.mkIf (cfg.enableGitIntegration && (cfg.package != null)) {
programs.git.settings.diff.lockb = lib.mkIf (cfg.enableGitIntegration && (cfg.package != null)) {
textconv = lib.getExe cfg.package;
binary = true;
};

2
modules/programs/gh.nix
View file

@ -188,7 +188,7 @@ in
fi
'';
programs.git.extraConfig.credential = mkIf cfg.gitCredentialHelper.enable (
programs.git.settings.credential = mkIf cfg.gitCredentialHelper.enable (
builtins.listToAttrs (
map (
host:

2
modules/programs/git-credential-keepassxc.nix
View file

@ -35,7 +35,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = [ cfg.package ];
programs.git.extraConfig.credential =
programs.git.settings.credential =
let
helperConfig =
let

2
modules/programs/git-credential-oauth.nix
View file

@ -35,7 +35,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = [ cfg.package ];
programs.git.extraConfig.credential.helper = lib.mkAfter [
programs.git.settings.credential.helper = lib.mkAfter [
(
"${cfg.package}/bin/git-credential-oauth"
+ lib.optionalString (cfg.extraFlags != [ ]) " ${lib.strings.concatStringsSep " " cfg.extraFlags}"

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 != [ ]) {

2
modules/programs/mergiraf.nix
View file

@ -29,7 +29,7 @@ in
programs.git = {
attributes = [ "* merge=mergiraf" ];
extraConfig = {
settings = {
merge = {
mergiraf = {
name = "mergiraf";

1
tests/modules/programs/git/default.nix
View file

@ -2,7 +2,6 @@
git-with-email = ./git-with-email.nix;
git-with-most-options = ./git.nix;
git-with-msmtp = ./git-with-msmtp.nix;
git-with-str-extra-config = ./git-with-str-extra-config.nix;
git-with-signing-key-id-legacy = ./git-with-signing-key-id-legacy.nix;
git-with-signing-key-id = ./git-with-signing-key-id.nix;
git-without-signing-key-id = ./git-without-signing-key-id.nix;

11
tests/modules/programs/git/git-with-str-extra-config-expected.conf
View file

@ -1,11 +0,0 @@
This can be anything.
[gpg]
format = "openpgp"
[gpg "openpgp"]
program = "path-to-gpg"
[user]
email = "user@example.org"
name = "John Doe"

25
tests/modules/programs/git/git-with-str-extra-config.nix
View file

@ -1,25 +0,0 @@
{
programs.git = {
enable = true;
signing.signer = "path-to-gpg";
extraConfig = ''
This can be anything.
'';
userEmail = "user@example.org";
userName = "John Doe";
};
test.asserts.warnings.expected = [
''
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.
''
];
nmt.script = ''
assertFileExists home-files/.config/git/config
assertFileContent home-files/.config/git/config \
${./git-with-str-extra-config-expected.conf}
'';
}

11
tests/modules/programs/git/git.nix
View file

@ -73,11 +73,12 @@ in
{
aliases.a2 = lib.mkForce "baz";
extraConfig."extra \"backcompat.with.dots\"".previously = "worked";
extraConfig.extra.boolean = true;
extraConfig.extra.integer = 38;
extraConfig.extra.multiple = [ 2 ];
extraConfig.extra.subsection.value = "test";
settings.alias.a2 = lib.mkForce "baz";
settings."extra \"backcompat.with.dots\"".previously = "worked";
settings.extra.boolean = true;
settings.extra.integer = 38;
settings.extra.multiple = [ 2 ];
settings.extra.subsection.value = "test";
}
];