Compare commits

...

3 commits

Author SHA1 Message Date
55a5e35d3d nvim: session: Do not depend on fugitive#Head
We intend to try jujutsu with various repos and fugitive#Head
does not work for jujutsu repos which intend to be in detached
head state.
2024-12-09 15:19:42 +05:30
24de7dc771 fish: functions: Add jujutsu information to prompt
fish shell prompt for jujutsu is copied from
https://gist.github.com/hroi/d0dc0e95221af858ee129fd66251897e
2024-12-09 15:19:42 +05:30
cf5e3874b5
arch-packages: Update package list 2024-12-09 14:18:07 +05:30
4 changed files with 48 additions and 9 deletions

View file

@ -25,6 +25,7 @@ bluez-utils
boost
brother-dcp-l2540dw-cups-bin
brother-dcp-l2540dw-lpr-bin
bustle
calibre
cantarell-fonts
cargo-asm
@ -45,11 +46,9 @@ cpio
cryptsetup
cups
cups-pdf
d-spy
dconf-editor
debugedit
debuginfod
deno
device-mapper
dhclient
dialog
@ -71,6 +70,8 @@ efibootmgr
efitools
elan-lean
element-desktop-nightly-bin
elixir
elixir-ls
endeavouros-keyring
endeavouros-mirrorlist
eos-hooks
@ -101,7 +102,6 @@ gcc
gdb
gdb-dashboard
gettext
ghcup-hs-bin
git
glib2-devel
gnu-netcat
@ -136,6 +136,7 @@ haveged
hdparm
helvum
hexyl
hotdoc
htop
hunspell-en_gb
hunspell-en_us
@ -152,6 +153,7 @@ iwd
iwgtk
jfsutils
jq
jujutsu
kanshi
keyserver-rank
kondo
@ -218,7 +220,6 @@ mutt
nasm
nbd
ncdu
ncmpcpp
ndisc6
net-tools
netctl
@ -229,7 +230,6 @@ nilfs-utils
nmap
noise-suppression-for-voice
notcurses
notmuch
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
@ -274,6 +274,7 @@ python
python-dbus
python-lxml
python-pandocfilters
python-poetry
python-pygments
qpdf
qt6-wayland
@ -283,6 +284,7 @@ reflector
repo
revive
ripgrep
rmpc-git
rmtrash
rp-pppoe
rpcsvc-proto
@ -350,7 +352,6 @@ usbutils
uv
v4l2loopback-dkms
valgrind
vesktop-bin
vulkan-mesa-layers
vulkan-radeon
wdisplays

View file

@ -0,0 +1,38 @@
function fish_jj_prompt --description 'Write out the jj prompt'
if not command -sq jj
return 1
end
if not jj root --quiet &>/dev/null
return 1
end
jj log --ignore-working-copy --no-graph --color always -r @ -T '
surround(
" (",
")",
separate(
" ",
bookmarks.join(", "),
coalesce(
surround(
"\"",
"\"",
if(
description.first_line().substr(0, 24).starts_with(description.first_line()),
description.first_line().substr(0, 24),
description.first_line().substr(0, 23) ++ "…"
)
),
"(no description set)"
),
change_id.shortest(),
commit_id.shortest(),
if(conflict, "(conflict)"),
if(empty, "(empty)"),
if(divergent, "(divergent)"),
if(hidden, "(hidden)"),
)
)
'
end

View file

@ -31,7 +31,8 @@ function fish_prompt
end
echo -n ' '
fish_custom_git_prompt
fish_jj_prompt
or fish_custom_git_prompt
if [ "$command_status" -eq 0 ]
set_color brcyan

View file

@ -27,10 +27,9 @@ endfunction
function! s:SessionLoad()
" Do not load session if
" - neovim is started with arguments
" - neovim is opened outside a git repository
" - neovim is in pager mode and is getting input from STDIN
" - neovim is opened with nvim -q
if (argc(-1) > 0 || fugitive#Head() == '' || g:session_in_pager_mode == 1 || (!empty(getqflist())))
if (argc(-1) > 0 || g:session_in_pager_mode == 1 || (!empty(getqflist())))
return
endif