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

git: change extraConfig from lines to attrs

Browse source
This commit is contained in:
Nikita Uvarov 2017-09-21 14:45:20 +02:00 • committed by Robert Helgesson
parent db55e596d2
commit 0f096f9ad4
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
2 changed files with 63 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

53
modules/programs/git.nix
View file

@ -65,34 +65,51 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "";
type = types.either types.attrs types.lines;
default = {};
description = "Additional configuration to add.";
};
iniContent = mkOption {
type = types.attrsOf types.attrs;
internal = true;
};
};
};
config = mkIf cfg.enable (
let
ini = {
user = {
name = cfg.userName;
email = cfg.userEmail;
} // optionalAttrs (cfg.signing != null) {
signingKey = cfg.signing.key;
};
} // optionalAttrs (cfg.signing != null) {
commit.gpgSign = cfg.signing.signByDefault;
gpg.program = cfg.signing.gpgPath;
} // optionalAttrs (cfg.aliases != {}) {
alias = cfg.aliases;
};
in
mkMerge [
{
home.packages = [ cfg.package ];
programs.git.iniContent.user = {
name = cfg.userName;
email = cfg.userEmail;
};
home.file.".gitconfig".text =
generators.toINI {} ini + "\n" + cfg.extraConfig;
generators.toINI {} cfg.iniContent;
}
(mkIf (cfg.signing != null) {
programs.git.iniContent = {
user.signingKey = cfg.signing.key;
commit.gpgSign = cfg.signing.signByDefault;
gpg.program = cfg.signing.gpgPath;
};
})
(mkIf (cfg.aliases != {}) {
programs.git.iniContent.alias = cfg.aliases;
})
(mkIf (lib.isAttrs cfg.extraConfig) {
programs.git.iniContent = cfg.extraConfig;
})
(mkIf (lib.isString cfg.extraConfig) {
home.file.".gitconfig".text = cfg.extraConfig;
})
]
);
}