eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-23 10:19:48 +01:00
Code Issues Releases Wiki Activity

git: add option to define store names for generated include files (#3171)

Browse source 
This allows to use gitconfig/gitconfig-some-intent
as store path suffixes for the texts.
This commit is contained in:
Ronny Pfannschmidt 2022-08-26 21:48:50 +02:00 committed by GitHub
parent 3d3bbdfe95
commit 5bb1f67568
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/programs/git.nix
View file

@ -130,10 +130,20 @@ let
</citerefentry>.
'';
};
};
config.path = mkIf (config.contents != { })
(mkDefault (pkgs.writeText "contents" (gitToIni config.contents)));
contentSuffix = mkOption {
type = types.str;
default = "gitconfig";
description = ''
Nix store name for the git configuration text file,
when generating the configuration text from nix options.
'';
};
};
config.path = mkIf (config.contents != { }) (mkDefault
(pkgs.writeText (hm.strings.storeFileName config.contentSuffix)
(gitToIni config.contents)));
});
in {

3
tests/modules/programs/git/git-expected.conf
View file

@ -56,3 +56,6 @@
[includeIf "gitdir:~/src/dir"]
path = "@git_include_path@"
[includeIf "gitdir:~/src/otherproject"]
path = "@git_named_include_path@"

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

@ -14,7 +14,9 @@ let
substituteExpected = path:
pkgs.substituteAll {
src = path;
git_include_path = pkgs.writeText "contents"
git_include_path = pkgs.writeText "hm_gitconfig"
(builtins.readFile ./git-expected-include.conf);
git_named_include_path = pkgs.writeText "hm_gitconfigwork"
(builtins.readFile ./git-expected-include.conf);
};
@ -46,6 +48,11 @@ in {
condition = "gitdir:~/src/dir";
contents = gitInclude;
}
{
condition = "gitdir:~/src/otherproject";
contents = gitInclude;
contentSuffix = "gitconfig-work";
}
];
signing = {
gpgPath = "path-to-gpg";