mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-26 03:24:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(fish): transient prompt

Browse source
This commit is contained in:
Jan De Dobbeleer 2022-03-23 10:32:54 +01:00 committed by Jan De Dobbeleer
parent 340c851743
commit 143074e0a7
3 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/docs/config-transient.mdx
View file

@ -8,7 +8,7 @@ import Tabs from "@theme/Tabs";
import TabItem from "@theme/TabItem";
:::info
This feature only works in `zsh`, `powershell` and `cmd` for the time being.
This feature only works in `fish`, `zsh`, `powershell` and `cmd` for the time being.
:::
Transient prompt, when enabled, replaces the prompt with a simpler one to allow more screen real estate.
@ -68,6 +68,7 @@ properties below - defaults to `{{ .Shell }}> `
{ label: 'powershell', value: 'pwsh', },
{ label: 'cmd', value: 'cmd', },
{ label: 'zsh', value: 'zsh', },
{ label: 'fish', value: 'fish', },
]
}>
<TabItem value="pwsh">
@ -110,6 +111,17 @@ enable_poshtransientprompt
Restart your shell or reload `.zshrc` using `exec zsh` for the changes to take effect.
</TabItem>
<TabItem value="fish">
Invoke Oh My Posh in `~/.config/fish/config.fish` and add the following line below:
```bash
enable_poshtransientprompt
```
Restart your shell or reload fish using `exec fish` for the changes to take effect.
</TabItem>
</Tabs>

2
src/engine/engine.go
View file

@ -332,7 +332,7 @@ func (e *Engine) PrintExtraPrompt(promptType ExtraPromptType) string {
return prompt
}
return str
case shell.PWSH, shell.PWSH5, shell.CMD, shell.BASH:
case shell.PWSH, shell.PWSH5, shell.CMD, shell.BASH, shell.FISH:
str, _ := e.Writer.String()
return str
}

46
src/shell/scripts/omp.fish
View file

@ -1,28 +1,38 @@
set -g POSH_THEME "::CONFIG::"
set -g POWERLINE_COMMAND "oh-my-posh"
set -g CONDA_PROMPT_MODIFIER false
set -g omp_tooltip_command ""
set --global POSH_THEME "::CONFIG::"
set --global POWERLINE_COMMAND "oh-my-posh"
set --global CONDA_PROMPT_MODIFIER false
set --global omp_tooltip_command ""
set --global omp_transient 0
function fish_prompt
set -g omp_status_cache $status
set -g omp_stack_count (count $dirstack)
set -g omp_duration "$CMD_DURATION$cmd_duration"
if test "$omp_transient" = "1"
::OMP:: prompt print transient --config $POSH_THEME --shell fish
return
end
set --global omp_status_cache $status
set --global omp_stack_count (count $dirstack)
set --global omp_duration "$CMD_DURATION$cmd_duration"
# check if variable set, < 3.2 case
if set -q omp_lastcommand; and test "$omp_lastcommand" = ""
if set --query omp_lastcommand; and test "$omp_lastcommand" = ""
set omp_duration 0
end
# works with fish >=3.2
if set -q omp_last_status_generation; and test "$omp_last_status_generation" = "$status_generation"
if set --query omp_last_status_generation; and test "$omp_last_status_generation" = "$status_generation"
set omp_duration 0
end
if set -q status_generation
set -gx omp_last_status_generation $status_generation
if set --query status_generation
set --global --export omp_last_status_generation $status_generation
end
::OMP:: prompt print primary --config $POSH_THEME --shell fish --error $omp_status_cache --execution-time $omp_duration --stack-count $omp_stack_count
end
function fish_right_prompt
if test "$omp_transient" = "1"
echo -n ""
set omp_transient 0
return
end
if test -n "$omp_tooltip_command"
::OMP:: prompt print tooltip --config $POSH_THEME --shell fish --command $omp_tooltip_command
set omp_tooltip_command ""
@ -34,7 +44,7 @@ end
function postexec_omp --on-event fish_postexec
# works with fish <3.2
# pre and postexec not fired for empty command in fish >=3.2
set -gx omp_lastcommand $argv
set --global --export omp_lastcommand $argv
end
# tooltip
@ -48,3 +58,15 @@ end
function enable_poshtooltips
bind \x20 _render_tooltip
end
# transient prompt
function _render_transient
set omp_transient 1
commandline --function repaint
commandline --function execute
end
function enable_poshtransientprompt
bind \r _render_transient
end