From cbd562ee429ea2f07274ece5413812aeeb60f70b Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 14 Mar 2025 01:37:14 +0900 Subject: [PATCH] bash: allow setting lsColorsFile to null Signed-off-by: misilelab --- nixos/modules/programs/bash/ls-colors.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/bash/ls-colors.nix b/nixos/modules/programs/bash/ls-colors.nix index bb78303fe7b6..8d4781e3c8d0 100644 --- a/nixos/modules/programs/bash/ls-colors.nix +++ b/nixos/modules/programs/bash/ls-colors.nix @@ -14,8 +14,8 @@ in default = true; }; programs.bash.lsColorsFile = lib.mkOption { - type = lib.types.path; - default = ""; + type = lib.types.nullOr lib.types.path; + default = null; example = lib.literalExpression "\${pkgs.dircolors-solarized}/ansi-dark"; description = "Alternative colorscheme for ls colors"; }; @@ -23,7 +23,9 @@ in config = lib.mkIf enable { programs.bash.promptPluginInit = '' - eval "$(${pkgs.coreutils}/bin/dircolors -b ${config.programs.bash.lsColorsFile})" + eval "$(${pkgs.coreutils}/bin/dircolors -b ${ + lib.optionalString (config.programs.bash.lsColorsFile != null) config.programs.bash.lsColorsFile + })" ''; }; }