eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2025-01-11 19:49:49 +01:00
Code Issues Releases Wiki Activity

nushell: fix non-nullable configFile and envFile, fixes #3050 (#3060)

Browse source
This commit is contained in:
Philipp Mildenberger 2022-07-07 08:49:50 +02:00 committed by GitHub
parent face4094d4
commit ef990143b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/programs/nushell.nix
View file

@ -58,7 +58,8 @@ in {
}; };
configFile = mkOption { configFile = mkOption {
type = linesOrSource "config.nu"; type = types.nullOr (linesOrSource "config.nu");
default = null;
example = literalExpression '' example = literalExpression ''
{ text = ''' { text = '''
let $config = { let $config = {
@ -78,7 +79,8 @@ in {
}; };
envFile = mkOption { envFile = mkOption {
type = linesOrSource "env.nu"; type = types.nullOr (linesOrSource "env.nu");
default = null;
example = '' example = ''
let-env FOO = 'BAR' let-env FOO = 'BAR'
''; '';
@ -94,7 +96,9 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
xdg.configFile."nushell/config.nu" = cfg.configFile; xdg.configFile = mkMerge [
xdg.configFile."nushell/env.nu" = cfg.envFile; (mkIf (cfg.configFile != null) { "nushell/config.nu" = cfg.configFile; })
(mkIf (cfg.envFile != null) { "nushell/env.nu" = cfg.envFile; })
];
}; };
} }