mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2024-12-14 11:57:55 +00:00
Code Activity

nushell: allow arbitrary environment variables

Browse source
This commit is contained in:
Joaquín Triñanes 2024-09-14 18:09:15 +02:00 committed by Robert Helgesson
parent edf15f1549
commit 628b15d275
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
3 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/programs/nushell.nix
View file

@ -145,11 +145,24 @@ in {
};
environmentVariables = mkOption {
type = types.attrsOf types.str;
type = types.attrsOf hm.types.nushellValue;
default = { };
example = { FOO = "BAR"; };
example = literalExpression ''
{
FOO = "BAR";
LIST_VALUE = [ "foo" "bar" ];
NU_LIB_DIRS = lib.concatStringsSep ":" [ ./scripts ];
PROMPT_COMMAND = lib.hm.nushell.mkNushellInline '''{|| "> "}''';
ENV_CONVERSIONS.PATH = {
from_string = lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
to_string = lib.hm.nushell.mkNushellInline "{|v| $v | str join (char esep) }";
};
}
'';
description = ''
An attribute set that maps an environment variable to a shell interpreted string.
Environment variables to be set.
Inline values can be set with `lib.hm.nushell.mkNushellInline`.
'';
};
};
@ -173,9 +186,11 @@ in {
})
(let
envVarsStr = concatStringsSep "\n"
(mapAttrsToList (k: v: "$env.${k} = ${v}") cfg.environmentVariables);
in mkIf (cfg.envFile != null || cfg.extraEnv != "" || envVarsStr != "") {
hasEnvVars = cfg.environmentVariables != { };
envVarsStr = ''
load-env ${hm.nushell.toNushell { } cfg.environmentVariables}
'';
in mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) {
"${configDir}/env.nu".text = mkMerge [
(mkIf (cfg.envFile != null) cfg.envFile.text)
cfg.extraEnv

15
tests/modules/programs/nushell/env-expected.nu
View file

@ -1,4 +1,17 @@
$env.FOO = 'BAR'
$env.BAR = $'(echo BAZ)'
load-env {
"ENV_CONVERSIONS": {
"PATH": {
"from_string": ({|s| $s | split row (char esep) })
"to_string": ({|v| $v | str join (char esep) })
}
}
"FOO": "BAR"
"LIST_VALUE": [
"foo"
"bar"
]
"PROMPT_COMMAND": ({|| "> "})
}

14
tests/modules/programs/nushell/example-settings.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, config, lib, ... }:
{
programs.nushell = {
@ -28,7 +28,17 @@
"ll" = "ls -a";
};
environmentVariables = { BAR = "$'(echo BAZ)'"; };
environmentVariables = {
FOO = "BAR";
LIST_VALUE = [ "foo" "bar" ];
PROMPT_COMMAND = lib.hm.nushell.mkNushellInline ''{|| "> "}'';
ENV_CONVERSIONS.PATH = {
from_string =
lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
to_string =
lib.hm.nushell.mkNushellInline "{|v| $v | str join (char esep) }";
};
};
};
test.stubs.nushell = { };