dln/dotfiles
0
0
Code Issues Pull requests 1 Activity

fish: Prettier prompt w/jj desc in separator line

Browse source
This commit is contained in:
Daniel Lundin 2024-11-19 16:48:04 +01:00
parent 74c622efab
commit 0069a95e5d
Signed by: dln
SSH key fingerprint: SHA256:dQy1Xj3UiqJYpKR5ggQ2bxgz4jCH8IF+k3AB8o0kmdI
1 changed files with 49 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
home/common/fish.nix
View file

@ -90,56 +90,71 @@
''; '';
fish_jj_prompt.body = '' fish_jj_prompt.body = ''
# Is jj installed? if not command -sq jj || not jj root --quiet &>/dev/null
if not command -sq jj return 1
return 1
end
# Are we in a jj repo?
if not jj root --quiet &>/dev/null
return 1
end end
# Generate prompt # Generate prompt
jj log --ignore-working-copy --no-graph --color always -r @ -T ' jj log --ignore-working-copy --no-graph --color never -r @ -T '
separate( surround(
" ", " \e[2;3m",
change_id.shortest(), "\e[0m",
coalesce( separate(
surround( " ",
"\"", surround("\e[0;35m", "\e[0m", bookmarks.join(":")),
"\"", separate(
if( " ",
description.first_line().substr(0, 24).starts_with(description.first_line()), surround("\e[0;1;95m", "\e[0;2;3m", change_id.shortest()),
description.first_line().substr(0, 24), surround("\e[0;34m", "\e[0;2;3m", commit_id.shortest()),
description.first_line().substr(0, 23) ++ "…" ),
) if(conflict, "󰂭"),
), if(empty, ""),
"(no description set)" if(divergent, ""),
), if(hidden, "󰘓"),
bookmarks.join(", "), )
commit_id.shortest(), )
if(conflict, "(conflict)"), '
if(empty, "(empty)"), '';
if(divergent, "(divergent)"),
if(hidden, "(hidden)"), fish_jj_desc.body = ''
if not command -sq jj || not jj root --quiet &>/dev/null
return 1
end
jj log --ignore-working-copy --no-graph --color never -r @ -T '
surround(
" \e[0;2;3m",
"\e[0m",
coalesce(
surround(
"\e[1;2;3m❝",
"❞\e[0m",
if(
description.first_line().substr(0, 80).starts_with(description.first_line()),
description.first_line().substr(0, 80),
description.first_line().substr(0, 79) ++ "…"
) )
),
"…"
),
)
' '
''; '';
fish_prompt.body = '' fish_prompt.body = ''
echo echo -e "\033[1;2;38;5;236m"
string pad -c '┄' -w $COLUMNS (fish_jj_desc)
echo -ne "\033[0;3m"
string join "" -- (set_color --italics) (prompt_hostname) ':' (prompt_pwd --full-length-dirs=4) (set_color yellow) ' ❯ ' (set_color normal) string join "" -- (set_color --italics) (prompt_hostname) ':' (prompt_pwd --full-length-dirs=4) (set_color yellow) ' ❯ ' (set_color normal)
''; '';
fish_right_prompt.body = '' fish_right_prompt.body = ''
fish_jj_prompt || fish_vcs_prompt
if test $CMD_DURATION -gt 3000 if test $CMD_DURATION -gt 3000
# Show duration of the last command in seconds # Show duration of the last command in seconds
set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.1fs", $1 / $2}') set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.1fs", $1 / $2}')
echo " ⏳$duration" echo -n "⏳$duration "
end end
fish_jj_prompt || fish_vcs_prompt
''; '';
transient_prompt_func.body = '' transient_prompt_func.body = ''