Merge pull request #268156 from reedriley/starship-env

nixos/starship: change module logic that sets STARSHIP_CONFIG to not override user config

Changed files
+21 -3
nixos
modules
programs
+21 -3
nixos/modules/programs/starship.nix
···
config = mkIf cfg.enable {
programs.bash.${initOption} = ''
if [[ $TERM != "dumb" ]]; then
-
export STARSHIP_CONFIG=${settingsFile}
+
# don't set STARSHIP_CONFIG automatically if there's a user-specified
+
# config file. starship appears to use a hardcoded config location
+
# rather than one inside an XDG folder:
+
# https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
+
if [[ ! -f "$HOME/.config/starship.toml" ]]; then
+
export STARSHIP_CONFIG=${settingsFile}
+
fi
eval "$(${pkgs.starship}/bin/starship init bash)"
fi
'';
programs.fish.${initOption} = ''
if test "$TERM" != "dumb"
-
set -x STARSHIP_CONFIG ${settingsFile}
+
# don't set STARSHIP_CONFIG automatically if there's a user-specified
+
# config file. starship appears to use a hardcoded config location
+
# rather than one inside an XDG folder:
+
# https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
+
if not test -f "$HOME/.config/starship.toml";
+
set -x STARSHIP_CONFIG ${settingsFile}
+
end
eval (${pkgs.starship}/bin/starship init fish)
end
'';
programs.zsh.${initOption} = ''
if [[ $TERM != "dumb" ]]; then
-
export STARSHIP_CONFIG=${settingsFile}
+
# don't set STARSHIP_CONFIG automatically if there's a user-specified
+
# config file. starship appears to use a hardcoded config location
+
# rather than one inside an XDG folder:
+
# https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
+
if [[ ! -f "$HOME/.config/starship.toml" ]]; then
+
export STARSHIP_CONFIG=${settingsFile}
+
fi
eval "$(${pkgs.starship}/bin/starship init zsh)"
fi
'';