about summary refs log tree commit diff
diff options
context:
space:
mode:
authorReed Riley <reed@riley.engineer>2023-11-17 10:59:55 -0800
committerReed Riley <reed@riley.engineer>2023-11-17 11:17:52 -0800
commit71d9dab8f0870f2609182299d260676320398883 (patch)
tree03c69e70c52c6de8e7757ea14485a86aa685e572
parente44462d6021bfe23dfb24b775cc7c390844f773d (diff)
downloadnixlib-71d9dab8f0870f2609182299d260676320398883.tar
nixlib-71d9dab8f0870f2609182299d260676320398883.tar.gz
nixlib-71d9dab8f0870f2609182299d260676320398883.tar.bz2
nixlib-71d9dab8f0870f2609182299d260676320398883.tar.lz
nixlib-71d9dab8f0870f2609182299d260676320398883.tar.xz
nixlib-71d9dab8f0870f2609182299d260676320398883.tar.zst
nixlib-71d9dab8f0870f2609182299d260676320398883.zip
starship: change logic that sets STARSHIP_CONFIG so that it won't override a user-provided config
-rw-r--r--nixos/modules/programs/starship.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix
index 9dca39da5edc..0d927165fa1a 100644
--- a/nixos/modules/programs/starship.nix
+++ b/nixos/modules/programs/starship.nix
@@ -44,21 +44,27 @@ in
   config = mkIf cfg.enable {
     programs.bash.${initOption} = ''
       if [[ $TERM != "dumb" ]]; then
-        export STARSHIP_CONFIG=${settingsFile}
+        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}
+        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}
+        if [[ ! -f "$HOME/.config/starship.toml" ]]; then
+          export STARSHIP_CONFIG=${settingsFile}
+        fi
         eval "$(${pkgs.starship}/bin/starship init zsh)"
       fi
     '';