mirror of
https://github.com/nix-community/home-manager
synced 2024-11-27 05:29:46 +01:00
address suggestions and implement a backwards compatible way to introduce this change
This commit is contained in:
parent
90388be582
commit
908c854859
1 changed files with 35 additions and 14 deletions
|
@ -2,14 +2,16 @@
|
|||
|
||||
let
|
||||
cfg = config.programs.awscli;
|
||||
|
||||
iniFormat = pkgs.formats.ini { };
|
||||
|
||||
settingsPath =
|
||||
if config.programs.awscli.settings.path != ""
|
||||
then config.programs.awscli.settings.path
|
||||
if config.programs.awscli.settingsPath != ""
|
||||
then config.programs.awscli.settingsPath
|
||||
else "${config.home.homeDirectory}/.aws/config";
|
||||
credentialsPath =
|
||||
if config.programs.awscli.credentials.path != ""
|
||||
then config.programs.awscli.credentials.path
|
||||
if config.programs.awscli.credentialsPath != ""
|
||||
then config.programs.awscli.credentialsPath
|
||||
else "${config.home.homeDirectory}/.aws/credentials";
|
||||
in {
|
||||
meta.maintainers = [ lib.maintainers.anthonyroussel ];
|
||||
|
@ -24,6 +26,15 @@ in {
|
|||
description = "Package providing {command}`aws`.";
|
||||
};
|
||||
|
||||
settingsPath = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
defaultText = "~/.config/aws/config";
|
||||
apply = builtins.toString;
|
||||
description = ''
|
||||
Absolute path to where the settings file should be placed.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule { freeformType = iniFormat.type; };
|
||||
default = { };
|
||||
|
@ -38,6 +49,15 @@ in {
|
|||
description = "Configuration written to {file}`$HOME/.aws/config`.";
|
||||
};
|
||||
|
||||
credentialsPath = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
defaultText = "~/.config/aws/credentials";
|
||||
apply = builtins.toString;
|
||||
description = ''
|
||||
Absolute path to where the credentials file should be placed.
|
||||
'';
|
||||
};
|
||||
|
||||
credentials = lib.mkOption {
|
||||
type = lib.types.submodule { freeformType = iniFormat.type; };
|
||||
default = { };
|
||||
|
@ -64,21 +84,22 @@ in {
|
|||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
home.sessionVariables =
|
||||
(lib.mkIf (cfg.settings.path != "") {
|
||||
AWS_CONFIG_FILE = cfg.settings.path;
|
||||
}) //
|
||||
(lib.mkIf (cfg.credentials.path != "") {
|
||||
AWS_SHARED_CREDENTIALS_FILE = cfg.credentials.path;
|
||||
});
|
||||
home.sessionVariables = mkMerge [
|
||||
(lib.mkIf (cfg.settingsPath != "") {
|
||||
AWS_CONFIG_FILE = cfg.settingsPath;
|
||||
})
|
||||
(lib.mkIf (cfg.credentialsPath != "") {
|
||||
AWS_SHARED_CREDENTIALS_FILE = cfg.credentialsPath;
|
||||
})
|
||||
];
|
||||
|
||||
home.file.(settingsPath) =
|
||||
home.file.${settingsPath} =
|
||||
lib.mkIf (cfg.settings != { }) {
|
||||
source = iniFormat.generate "aws-config-${config.home.username}"
|
||||
cfg.settings;
|
||||
};
|
||||
|
||||
home.file.(credentialsPath) =
|
||||
home.file.${credentialsPath} =
|
||||
lib.mkIf (cfg.credentials != { }) {
|
||||
source = iniFormat.generate "aws-credentials-${config.home.username}"
|
||||
cfg.credentials;
|
||||
|
|
Loading…
Reference in a new issue