vividboarder
/
shoestrap
mirror of https://github.com/ViViDboarder/shoestrap.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up fish prompt scripts 

Now using more functions provided by fish rather than custom
ones to determine path and git prompt
This commit is contained in:
ViViDboarder 2019-11-21 12:05:36 -08:00
parent d7c9c80689
commit fc274955c1
2 changed files with 20 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
assets/default/fish/functions/fish_prompt.fish
View File

@ -2,35 +2,13 @@
function _status_color
# Returns a color for successful or failed previous command
if test $last_status -eq 0
if test $__prompt_last_status -eq 0
echo (set_color -o green)
else
echo (set_color -o red)
end
end
function _git_branch_name
# Returns the name of the current git branch
echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
end
function _is_git_dirty
echo (command git status -s --ignore-submodules=dirty ^/dev/null)
end
function _git_info
# Returns what is to be displayed for the git info
if [ (_git_branch_name) ]
if [ (_is_git_dirty) ]
set branch_color (set_color -o red)
else
set branch_color (set_color -o yellow)
end
set -l git_branch (_git_branch_name)
echo " $branch_color($git_branch)"(set_color normal)
end
end
function _hostname
# Returns the hostname if not using tmux since tmux will display
if [ -z $TMUX ]
@ -52,18 +30,13 @@ end
function fish_prompt
# Build full left side prompt
# NOTE: this becomes a global variable
set -g last_status $status
# Collect last status for coloring prompt
set -g __prompt_last_status $status
set -l cyan (set_color -o cyan)
set -l yellow (set_color -o yellow)
set -l red (set_color -o red)
set -l blue (set_color -o blue)
set -l green (set_color -o green)
set -l normal (set_color normal)
# set -l arrow (_status_color) "➜ $normal"
set -l cwd (basename (prompt_pwd))
echo -n -s $arrow (_hostname) $cwd (_git_info) (_prompt_char) ' '
# Configure git prompt
set -g __fish_git_prompt_showcolorhints 1
set -g __fish_git_prompt_showdirtystate 1
set -g __fish_git_prompt_showstashstate 1
set -g __fish_git_prompt_showuntrackedfiles 1
echo -n -s $arrow (_hostname) (prompt_pwd) (__fish_git_prompt) (_prompt_char) ' '
end

28
assets/default/fish/functions/fish_right_prompt.fish
View File

@ -4,17 +4,17 @@ set -xg VIRTUAL_ENV_DISABLE_PROMPT 1
# Returns identifier for target from github.com/heroku/force
# requires teh following additional script
# https://github.com/ViViDboarder/shoestrap/blob/clean-shoes/assets/default/force-cli/force-target
function _force_target
if [ (git config force.use) ]
set -l org (force-target)
echo "[$org]"
function _force_target_name
if [ (git config force.use) ]
set -l org (force-target)
echo "[$org]"
end
end
function _virtual_env
if [ $VIRTUAL_ENV ]
set -l venv (basename "$VIRTUAL_ENV")
echo "[$venv]"
function _virtual_env_name
if [ $VIRTUAL_ENV ]
set -l venv (basename "$VIRTUAL_ENV")
echo "[$venv]"
end
end
@ -24,13 +24,7 @@ function _right_prompt_aux
end
function fish_right_prompt
set -l cyan (set_color -o cyan)
set -l yellow (set_color -o yellow)
set -l red (set_color -o red)
set -l blue (set_color -o blue)
set -l green (set_color -o green)
set -l normal (set_color normal)
echo -n $green (_force_target) (_virtual_env) (_right_prompt_aux)
set_color normal
# Set prompt showing full force instance or virtualenv names
echo -n (set_color -o green) (_force_target_name) (_virtual_env_name) (_right_prompt_aux)
set_color normal
end