From ef990143b6ae86685fc24a8d40538834a28fc994 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Thu, 7 Jul 2022 08:49:50 +0200
Subject: [PATCH] nushell: fix non-nullable configFile and envFile, fixes #3050
(#3060)
---
modules/programs/nushell.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index d413a43f5..58b477989 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -58,7 +58,8 @@ in {
};
configFile = mkOption {
- type = linesOrSource "config.nu";
+ type = types.nullOr (linesOrSource "config.nu");
+ default = null;
example = literalExpression ''
{ text = '''
let $config = {
@@ -78,7 +79,8 @@ in {
};
envFile = mkOption {
- type = linesOrSource "env.nu";
+ type = types.nullOr (linesOrSource "env.nu");
+ default = null;
example = ''
let-env FOO = 'BAR'
'';
@@ -94,7 +96,9 @@ in {
config = mkIf cfg.enable {
home.packages = [ cfg.package ];
- xdg.configFile."nushell/config.nu" = cfg.configFile;
- xdg.configFile."nushell/env.nu" = cfg.envFile;
+ xdg.configFile = mkMerge [
+ (mkIf (cfg.configFile != null) { "nushell/config.nu" = cfg.configFile; })
+ (mkIf (cfg.envFile != null) { "nushell/env.nu" = cfg.envFile; })
+ ];
};
}