mirror of
https://github.com/oh-my-fish/oh-my-fish.git
synced 2024-11-26 10:13:46 +08:00
Merge pull request #251 from tannhuber/master
This commit is contained in:
Bruno Pinto
commit
cf5b5abadc
|
|
@ -171,7 +171,8 @@ It makes the commandline as powerful as your editor. If `$EDITOR` is not set,
|
|||
vi is used.
|
||||
|
||||
The following shortcut needs vi mode:
|
||||
- Type `.` in NORMAL mode to edit commandline in editor.
|
||||
- Type `.` in NORMAL mode or `\cv` in NORMAL/INSERT mode to edit commandline in
|
||||
editor.
|
||||
|
||||
## Sessions
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
set -U budspencer_night 000000 083743 445659 fdf6e3 b58900 cb4b16 dc121f af005f 6c71c4 268bd2 2aa198 859900
|
||||
set -U budspencer_day 000000 333333 666666 ffffff ffff00 ff6600 ff0000 ff0033 3300ff 00aaff 00ffff 00ff00
|
||||
if not set -q budspencer_colors
|
||||
# Values are: black dark_gray light_gray white yellow orange red magenta violet blue cyan green
|
||||
set -U budspencer_colors $budspencer_night
|
||||
# Values are: black dark_gray light_gray white yellow orange red magenta violet blue cyan green
|
||||
set -U budspencer_colors $budspencer_night
|
||||
end
|
||||
|
||||
# Cursor color changes according to vi-mode
|
||||
|
|
@ -38,7 +38,7 @@ set -U budspencer_cursors "\033]12;#$budspencer_colors[10]\007" "\033]12;#$budsp
|
|||
# Some terminals cannot change the cursor color
|
||||
set -l unsupported_terminals 'fbterm' 'st' 'linux' 'screen'
|
||||
if contains $TERM $unsupported_terminals
|
||||
set budspencer_cursors '' '' '' ''
|
||||
set budspencer_cursors '' '' '' ''
|
||||
end
|
||||
|
||||
###############################################################################
|
||||
|
|
@ -49,54 +49,54 @@ end
|
|||
# => Help
|
||||
#########
|
||||
function budspencer_help -d 'Show helpfile'
|
||||
set -l readme_file "$fish_path/themes/budspencer/README.md"
|
||||
if set -q PAGER
|
||||
if [ -e $readme_file ]
|
||||
eval $PAGER $readme_file
|
||||
else
|
||||
set_color $fish_color_error[1]
|
||||
echo "$readme_file wasn't found."
|
||||
end
|
||||
else
|
||||
open $readme_file
|
||||
end
|
||||
set -l readme_file "$fish_path/themes/budspencer/README.md"
|
||||
if set -q PAGER
|
||||
if [ -e $readme_file ]
|
||||
eval $PAGER $readme_file
|
||||
else
|
||||
set_color $fish_color_error[1]
|
||||
echo "$readme_file wasn't found."
|
||||
end
|
||||
else
|
||||
open $readme_file
|
||||
end
|
||||
end
|
||||
|
||||
################
|
||||
# => Environment
|
||||
################
|
||||
function day -d "Set color palette for bright environment."
|
||||
set budspencer_colors $budspencer_day
|
||||
set budspencer_cursors "\033]12;#$budspencer_colors[10]\007" "\033]12;#$budspencer_colors[5]\007" "\033]12;#$budspencer_colors[8]\007" "\033]12;#$budspencer_colors[9]\007"
|
||||
set budspencer_colors $budspencer_day
|
||||
set budspencer_cursors "\033]12;#$budspencer_colors[10]\007" "\033]12;#$budspencer_colors[5]\007" "\033]12;#$budspencer_colors[8]\007" "\033]12;#$budspencer_colors[9]\007"
|
||||
end
|
||||
|
||||
function night -d "Set color palette for dark environment."
|
||||
set budspencer_colors $budspencer_night
|
||||
set budspencer_cursors "\033]12;#$budspencer_colors[10]\007" "\033]12;#$budspencer_colors[5]\007" "\033]12;#$budspencer_colors[8]\007" "\033]12;#$budspencer_colors[9]\007"
|
||||
set budspencer_colors $budspencer_night
|
||||
set budspencer_cursors "\033]12;#$budspencer_colors[10]\007" "\033]12;#$budspencer_colors[5]\007" "\033]12;#$budspencer_colors[8]\007" "\033]12;#$budspencer_colors[9]\007"
|
||||
end
|
||||
|
||||
#################
|
||||
# => Window title
|
||||
#################
|
||||
function wt -d 'Set window title'
|
||||
set -g window_title $argv
|
||||
function fish_title
|
||||
echo -n $window_title
|
||||
end
|
||||
set -g window_title $argv
|
||||
function fish_title
|
||||
echo -n $window_title
|
||||
end
|
||||
end
|
||||
|
||||
####################
|
||||
# => Welcome message
|
||||
####################
|
||||
function fish_greeting -d 'Show greeting in login shell.'
|
||||
if not set -q budspencer_nogreeting
|
||||
if begin
|
||||
not set -q -x LOGIN
|
||||
and not set -q -x RANGER_LEVEL
|
||||
and not set -q -x VIM
|
||||
end
|
||||
echo This is (set_color -b $budspencer_colors[2] $budspencer_colors[10])budspencer(set_color normal) theme for fish, a theme for the 70s.
|
||||
echo Type (set_color -b $budspencer_colors[2] $budspencer_colors[6])»budspencer_help«(set_color normal) in order to see how you can speed up your workflow.
|
||||
end
|
||||
end
|
||||
if not set -q budspencer_nogreeting
|
||||
if begin
|
||||
not set -q -x LOGIN
|
||||
and not set -q -x RANGER_LEVEL
|
||||
and not set -q -x VIM
|
||||
end
|
||||
echo This is (set_color -b $budspencer_colors[2] $budspencer_colors[10])budspencer(set_color normal) theme for fish, a theme for the 70s.
|
||||
echo Type (set_color -b $budspencer_colors[2] $budspencer_colors[6])»budspencer_help«(set_color normal) in order to see how you can speed up your workflow.
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -27,205 +27,206 @@
|
|||
# => Toggle functions
|
||||
#####################
|
||||
function __budspencer_toggle_symbols -d 'Toggles style of symbols, press # in NORMAL or VISUAL mode'
|
||||
if [ $symbols_style = 'symbols' ]
|
||||
set symbols_style 'numbers'
|
||||
else
|
||||
set symbols_style 'symbols'
|
||||
end
|
||||
set pwd_hist_lock true
|
||||
commandline -f repaint
|
||||
if [ $symbols_style = 'symbols' ]
|
||||
set symbols_style 'numbers'
|
||||
else
|
||||
set symbols_style 'symbols'
|
||||
end
|
||||
set pwd_hist_lock true
|
||||
commandline -f repaint
|
||||
end
|
||||
|
||||
function __budspencer_toggle_pwd -d 'Toggles style of pwd segment, press space bar in NORMAL or VISUAL mode'
|
||||
for i in (seq (count $budspencer_pwdstyle))
|
||||
if [ $budspencer_pwdstyle[$i] = $pwd_style ]
|
||||
set pwd_style $budspencer_pwdstyle[(expr $i \% (count $budspencer_pwdstyle) + 1)]
|
||||
set pwd_hist_lock true
|
||||
commandline -f repaint
|
||||
break
|
||||
end
|
||||
end
|
||||
for i in (seq (count $budspencer_pwdstyle))
|
||||
if [ $budspencer_pwdstyle[$i] = $pwd_style ]
|
||||
set pwd_style $budspencer_pwdstyle[(expr $i \% (count $budspencer_pwdstyle) + 1)]
|
||||
set pwd_hist_lock true
|
||||
commandline -f repaint
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
#############################
|
||||
# => Command duration segment
|
||||
#############################
|
||||
function __budspencer_cmd_duration -d 'Displays the elapsed time of last command'
|
||||
set -l seconds ''
|
||||
set -l minutes ''
|
||||
set -l hours ''
|
||||
set -l days ''
|
||||
set -l cmd_duration (expr $CMD_DURATION / 1000)
|
||||
if [ $cmd_duration -gt 0 ]
|
||||
set seconds (expr $cmd_duration \% 68400 \% 3600 \% 60)'s'
|
||||
if [ $cmd_duration -ge 60 ]
|
||||
set minutes (expr $cmd_duration \% 68400 \% 3600 / 60)'m'
|
||||
if [ $cmd_duration -ge 3600 ]
|
||||
set hours (expr $cmd_duration \% 68400 / 3600)'h'
|
||||
if [ $cmd_duration -ge 68400 ]
|
||||
set days (expr $cmd_duration / 68400)'d'
|
||||
end
|
||||
end
|
||||
end
|
||||
if [ $last_status -ne 0 ]
|
||||
echo -n (set_color $budspencer_colors[2])''(set_color -b $budspencer_colors[2] $budspencer_colors[7])' '$days$hours$minutes$seconds
|
||||
else
|
||||
echo -n (set_color $budspencer_colors[2])''(set_color -b $budspencer_colors[2] $budspencer_colors[12])' '$days$hours$minutes$seconds
|
||||
end
|
||||
end
|
||||
set -l seconds ''
|
||||
set -l minutes ''
|
||||
set -l hours ''
|
||||
set -l days ''
|
||||
set -l cmd_duration (expr $CMD_DURATION / 1000)
|
||||
if [ $cmd_duration -gt 0 ]
|
||||
set seconds (expr $cmd_duration \% 68400 \% 3600 \% 60)'s'
|
||||
if [ $cmd_duration -ge 60 ]
|
||||
set minutes (expr $cmd_duration \% 68400 \% 3600 / 60)'m'
|
||||
if [ $cmd_duration -ge 3600 ]
|
||||
set hours (expr $cmd_duration \% 68400 / 3600)'h'
|
||||
if [ $cmd_duration -ge 68400 ]
|
||||
set days (expr $cmd_duration / 68400)'d'
|
||||
end
|
||||
end
|
||||
end
|
||||
if [ $last_status -ne 0 ]
|
||||
echo -n (set_color $budspencer_colors[2])''(set_color -b $budspencer_colors[2] $budspencer_colors[7])' '$days$hours$minutes$seconds
|
||||
else
|
||||
echo -n (set_color $budspencer_colors[2])''(set_color -b $budspencer_colors[2] $budspencer_colors[12])' '$days$hours$minutes$seconds
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
################
|
||||
# => Git segment
|
||||
################
|
||||
function __budspencer_is_git_ahead_or_behind -d 'Check if there are unpulled or unpushed commits'
|
||||
command git rev-list --count --left-right 'HEAD...@{upstream}' ^ /dev/null | sed 's|\s\+|\n|g'
|
||||
command git rev-list --count --left-right 'HEAD...@{upstream}' ^ /dev/null | sed 's|\s\+|\n|g'
|
||||
end
|
||||
|
||||
function __budspencer_git_status -d 'Check git status'
|
||||
set -l git_status (command git status --porcelain ^/dev/null | cut -c 1-2)
|
||||
set -l added (echo -sn $git_status\n | egrep -c "[ACDMT][ MT]|[ACMT]D")
|
||||
set -l deleted (echo -sn $git_status\n | egrep -c "[ ACMRT]D")
|
||||
set -l modified (echo -sn $git_status\n | egrep -c ".[MT]")
|
||||
set -l renamed (echo -sn $git_status\n | egrep -c "R.")
|
||||
set -l unmerged (echo -sn $git_status\n | egrep -c "AA|DD|U.|.U")
|
||||
set -l untracked (echo -sn $git_status\n | egrep -c "\?\?")
|
||||
echo -n $added\n$deleted\n$modified\n$renamed\n$unmerged\n$untracked
|
||||
set -l git_status (command git status --porcelain ^/dev/null | cut -c 1-2)
|
||||
set -l added (echo -sn $git_status\n | egrep -c "[ACDMT][ MT]|[ACMT]D")
|
||||
set -l deleted (echo -sn $git_status\n | egrep -c "[ ACMRT]D")
|
||||
set -l modified (echo -sn $git_status\n | egrep -c ".[MT]")
|
||||
set -l renamed (echo -sn $git_status\n | egrep -c "R.")
|
||||
set -l unmerged (echo -sn $git_status\n | egrep -c "AA|DD|U.|.U")
|
||||
set -l untracked (echo -sn $git_status\n | egrep -c "\?\?")
|
||||
echo -n $added\n$deleted\n$modified\n$renamed\n$unmerged\n$untracked
|
||||
end
|
||||
|
||||
function __budspencer_is_git_stashed -d 'Check if there are stashed commits'
|
||||
command git stash list ^ /dev/null | wc -l
|
||||
command git log --format="%gd" -g $argv 'refs/stash' -- ^ /dev/null | wc -l
|
||||
end
|
||||
|
||||
function __budspencer_prompt_git_symbols -d 'Displays the git symbols'
|
||||
set -l is_repo (command git rev-parse --is-inside-work-tree ^/dev/null)
|
||||
set -l git_ahead_behind (__budspencer_is_git_ahead_or_behind)
|
||||
set -l git_status (__budspencer_git_status)
|
||||
set -l git_stashed (__budspencer_is_git_stashed)
|
||||
set -l is_repo (command git rev-parse --is-inside-work-tree ^/dev/null)
|
||||
if [ -z $is_repo ]
|
||||
return
|
||||
end
|
||||
|
||||
if begin
|
||||
[ $is_repo=true ]
|
||||
[ (expr $git_status[1] + $git_status[2] + $git_status[3] + $git_status[4] + $git_status[5] + $git_status[6]) -ne 0 ]
|
||||
end
|
||||
set_color $budspencer_colors[3]
|
||||
echo -n ''
|
||||
set_color -b $budspencer_colors[3]
|
||||
if [ $symbols_style = 'symbols' ]
|
||||
if [ (count $git_ahead_behind) -eq 2 ]
|
||||
if [ $git_ahead_behind[1] -gt 0 ]
|
||||
set_color -o $budspencer_colors[5]
|
||||
echo -n ' ↑'
|
||||
end
|
||||
if [ $git_ahead_behind[2] -gt 0 ]
|
||||
set_color -o $budspencer_colors[5]
|
||||
echo -n ' ↓'
|
||||
end
|
||||
end
|
||||
if [ $git_status[1] -gt 0 ]
|
||||
set_color -o $budspencer_colors[12]
|
||||
echo -n ' +'
|
||||
end
|
||||
if [ $git_status[2] -gt 0 ]
|
||||
set_color -o $budspencer_colors[7]
|
||||
echo -n ' –'
|
||||
end
|
||||
if [ $git_status[3] -gt 0 ]
|
||||
set_color -o $budspencer_colors[10]
|
||||
echo -n ' ✱'
|
||||
end
|
||||
if [ $git_status[4] -gt 0 ]
|
||||
set_color -o $budspencer_colors[8]
|
||||
echo -n ' →'
|
||||
end
|
||||
if [ $git_status[5] -gt 0 ]
|
||||
set_color -o $budspencer_colors[9]
|
||||
echo -n ' ═'
|
||||
end
|
||||
if [ $git_status[6] -gt 0 ]
|
||||
set_color -o $budspencer_colors[4]
|
||||
echo -n ' ●'
|
||||
end
|
||||
if [ $git_stashed -gt 0 ]
|
||||
set_color -o $budspencer_colors[11]
|
||||
echo -n ' ✭'
|
||||
end
|
||||
else
|
||||
if [ (count $git_ahead_behind) -eq 2 ]
|
||||
if [ $git_ahead_behind[1] -gt 0 ]
|
||||
set_color $budspencer_colors[5]
|
||||
echo -n ' '$git_ahead_behind[1]
|
||||
end
|
||||
if [ $git_ahead_behind[2] -gt 0 ]
|
||||
set_color $budspencer_colors[5]
|
||||
echo -n ' '$git_ahead_behind[2]
|
||||
end
|
||||
end
|
||||
if [ $git_status[1] -gt 0 ]
|
||||
set_color $budspencer_colors[12]
|
||||
echo -n ' '$git_status[1]
|
||||
end
|
||||
if [ $git_status[2] -gt 0 ]
|
||||
set_color $budspencer_colors[7]
|
||||
echo -n ' '$git_status[2]
|
||||
end
|
||||
if [ $git_status[3] -gt 0 ]
|
||||
set_color $budspencer_colors[10]
|
||||
echo -n ' '$git_status[3]
|
||||
end
|
||||
if [ $git_status[4] -gt 0 ]
|
||||
set_color $budspencer_colors[8]
|
||||
echo -n ' '$git_status[4]
|
||||
end
|
||||
if [ $git_status[5] -gt 0 ]
|
||||
set_color $budspencer_colors[9]
|
||||
echo -n ' '$git_status[5]
|
||||
end
|
||||
if [ $git_status[6] -gt 0 ]
|
||||
set_color $budspencer_colors[4]
|
||||
echo -n ' '$git_status[6]
|
||||
end
|
||||
if [ $git_stashed -gt 0 ]
|
||||
set_color $budspencer_colors[11]
|
||||
echo -n ' '$git_stashed
|
||||
end
|
||||
end
|
||||
set_color -b $budspencer_colors[3] normal
|
||||
end
|
||||
set -l git_ahead_behind (__budspencer_is_git_ahead_or_behind)
|
||||
set -l git_status (__budspencer_git_status)
|
||||
set -l git_stashed (__budspencer_is_git_stashed)
|
||||
|
||||
if [ (expr $git_status[1] + $git_status[2] + $git_status[3] + $git_status[4] + $git_status[5] + $git_status[6] + $git_stashed) -ne 0 ]
|
||||
set_color $budspencer_colors[3]
|
||||
echo -n ''
|
||||
set_color -b $budspencer_colors[3]
|
||||
if [ $symbols_style = 'symbols' ]
|
||||
if [ (count $git_ahead_behind) -eq 2 ]
|
||||
if [ $git_ahead_behind[1] -gt 0 ]
|
||||
set_color -o $budspencer_colors[5]
|
||||
echo -n ' ↑'
|
||||
end
|
||||
if [ $git_ahead_behind[2] -gt 0 ]
|
||||
set_color -o $budspencer_colors[5]
|
||||
echo -n ' ↓'
|
||||
end
|
||||
end
|
||||
if [ $git_status[1] -gt 0 ]
|
||||
set_color -o $budspencer_colors[12]
|
||||
echo -n ' +'
|
||||
end
|
||||
if [ $git_status[2] -gt 0 ]
|
||||
set_color -o $budspencer_colors[7]
|
||||
echo -n ' –'
|
||||
end
|
||||
if [ $git_status[3] -gt 0 ]
|
||||
set_color -o $budspencer_colors[10]
|
||||
echo -n ' ✱'
|
||||
end
|
||||
if [ $git_status[4] -gt 0 ]
|
||||
set_color -o $budspencer_colors[8]
|
||||
echo -n ' →'
|
||||
end
|
||||
if [ $git_status[5] -gt 0 ]
|
||||
set_color -o $budspencer_colors[9]
|
||||
echo -n ' ═'
|
||||
end
|
||||
if [ $git_status[6] -gt 0 ]
|
||||
set_color -o $budspencer_colors[4]
|
||||
echo -n ' ●'
|
||||
end
|
||||
if [ $git_stashed -gt 0 ]
|
||||
set_color -o $budspencer_colors[11]
|
||||
echo -n ' ✭'
|
||||
end
|
||||
else
|
||||
if [ (count $git_ahead_behind) -eq 2 ]
|
||||
if [ $git_ahead_behind[1] -gt 0 ]
|
||||
set_color $budspencer_colors[5]
|
||||
echo -n ' '$git_ahead_behind[1]
|
||||
end
|
||||
if [ $git_ahead_behind[2] -gt 0 ]
|
||||
set_color $budspencer_colors[5]
|
||||
echo -n ' '$git_ahead_behind[2]
|
||||
end
|
||||
end
|
||||
if [ $git_status[1] -gt 0 ]
|
||||
set_color $budspencer_colors[12]
|
||||
echo -n ' '$git_status[1]
|
||||
end
|
||||
if [ $git_status[2] -gt 0 ]
|
||||
set_color $budspencer_colors[7]
|
||||
echo -n ' '$git_status[2]
|
||||
end
|
||||
if [ $git_status[3] -gt 0 ]
|
||||
set_color $budspencer_colors[10]
|
||||
echo -n ' '$git_status[3]
|
||||
end
|
||||
if [ $git_status[4] -gt 0 ]
|
||||
set_color $budspencer_colors[8]
|
||||
echo -n ' '$git_status[4]
|
||||
end
|
||||
if [ $git_status[5] -gt 0 ]
|
||||
set_color $budspencer_colors[9]
|
||||
echo -n ' '$git_status[5]
|
||||
end
|
||||
if [ $git_status[6] -gt 0 ]
|
||||
set_color $budspencer_colors[4]
|
||||
echo -n ' '$git_status[6]
|
||||
end
|
||||
if [ $git_stashed -gt 0 ]
|
||||
set_color $budspencer_colors[11]
|
||||
echo -n ' '$git_stashed
|
||||
end
|
||||
end
|
||||
set_color -b $budspencer_colors[3] normal
|
||||
end
|
||||
end
|
||||
|
||||
################
|
||||
# => PWD segment
|
||||
################
|
||||
function __budspencer_prompt_pwd -d 'Displays the present working directory'
|
||||
set -l user_host ' '
|
||||
if set -q SSH_CLIENT
|
||||
if [ $symbols_style = 'symbols' ]
|
||||
switch $pwd_style
|
||||
case short
|
||||
set user_host " $USER@"(hostname -s)':'
|
||||
case long
|
||||
set user_host " $USER@"(hostname -f)':'
|
||||
end
|
||||
else
|
||||
set user_host " $USER@"(hostname -i)':'
|
||||
end
|
||||
end
|
||||
set_color $budspencer_current_bindmode_color
|
||||
echo -n ''
|
||||
set_color normal
|
||||
set_color -b $budspencer_current_bindmode_color $budspencer_colors[1]
|
||||
if [ (count $budspencer_prompt_error) != 1 ]
|
||||
switch $pwd_style
|
||||
case short
|
||||
echo -n $user_host(prompt_pwd)' '
|
||||
case long
|
||||
echo -n $user_host$PWD' '
|
||||
end
|
||||
else
|
||||
echo -n " $budspencer_prompt_error "
|
||||
set -e budspencer_prompt_error[1]
|
||||
end
|
||||
set_color normal
|
||||
set -l user_host ' '
|
||||
if set -q SSH_CLIENT
|
||||
if [ $symbols_style = 'symbols' ]
|
||||
switch $pwd_style
|
||||
case short
|
||||
set user_host " $USER@"(hostname -s)':'
|
||||
case long
|
||||
set user_host " $USER@"(hostname -f)':'
|
||||
end
|
||||
else
|
||||
set user_host " $USER@"(hostname -i)':'
|
||||
end
|
||||
end
|
||||
set_color $budspencer_current_bindmode_color
|
||||
echo -n ''
|
||||
set_color normal
|
||||
set_color -b $budspencer_current_bindmode_color $budspencer_colors[1]
|
||||
if [ (count $budspencer_prompt_error) != 1 ]
|
||||
switch $pwd_style
|
||||
case short
|
||||
echo -n $user_host(prompt_pwd)' '
|
||||
case long
|
||||
echo -n $user_host(pwd)' '
|
||||
end
|
||||
else
|
||||
echo -n " $budspencer_prompt_error "
|
||||
set -e budspencer_prompt_error[1]
|
||||
end
|
||||
set_color normal
|
||||
end
|
||||
|
||||
###############################################################################
|
||||
|
|
@ -233,6 +234,6 @@ end
|
|||
###############################################################################
|
||||
|
||||
function fish_right_prompt -d 'Write out the right prompt of the budspencer theme'
|
||||
echo -n (__budspencer_cmd_duration) (__budspencer_prompt_git_symbols) (__budspencer_prompt_pwd)
|
||||
set_color normal
|
||||
echo -n (__budspencer_cmd_duration) (__budspencer_prompt_git_symbols) (__budspencer_prompt_pwd)
|
||||
set_color normal
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user