diff options
| author | Kid <44045911+kidonng@users.noreply.github.com> | 2021-04-30 01:16:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 19:16:10 +0200 |
| commit | 16855fe8e24773173ee89e35108a538a831c0046 (patch) | |
| tree | 92d23afe0252d93bba57b4f47f0f21f56fabc1dd | |
| parent | d57a0fe9df68a4e0eff5ff488391b0ccf714a203 (diff) | |
fix(fish): explicitly set scope in fish init script (#2636)
* fix: use correct scope in fish init script
* Prefix variable names with Starship
* Use `functions -e` to remove `fish_mode_prompt`
* Update src/init/starship.fish
Co-authored-by: Dario Vladović <d.vladimyr@gmail.com>
Co-authored-by: Dario Vladović <d.vladimyr@gmail.com>
| -rw-r--r-- | src/init/starship.fish | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/init/starship.fish b/src/init/starship.fish index 595e16b33..a5716d3bd 100644 --- a/src/init/starship.fish +++ b/src/init/starship.fish @@ -1,20 +1,22 @@ function fish_prompt switch "$fish_key_bindings" case fish_hybrid_key_bindings fish_vi_key_bindings - set keymap "$fish_bind_mode" + set STARSHIP_KEYMAP "$fish_bind_mode" case '*' - set keymap insert + set STARSHIP_KEYMAP insert end - set -l exit_code $status + set STARSHIP_CMD_STATUS $status # Account for changes in variable name between v2.7 and v3.0 - set -l starship_duration "$CMD_DURATION$cmd_duration" - ::STARSHIP:: prompt --status=$exit_code --keymap=$keymap --cmd-duration=$starship_duration --jobs=(count (jobs -p)) + set STARSHIP_DURATION "$CMD_DURATION$cmd_duration" + ::STARSHIP:: prompt --status=$STARSHIP_CMD_STATUS --keymap=$STARSHIP_KEYMAP --cmd-duration=$STARSHIP_DURATION --jobs=(count (jobs -p)) end -# disable virtualenv prompt, it breaks starship -set VIRTUAL_ENV_DISABLE_PROMPT 1 +# Disable virtualenv prompt, it breaks starship +set -g VIRTUAL_ENV_DISABLE_PROMPT 1 + +# Remove default mode prompt +builtin functions -e fish_mode_prompt -function fish_mode_prompt; end set -gx STARSHIP_SHELL "fish" # Set up the session key that will be used to store logs |