Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

yazi: update shell integrations (#5048)

Browse source 
(cherry picked from commit 1d085ea444)
This commit is contained in:
XYenon 2024-02-27 07:00:56 +08:00 committed by Robert Helgesson
parent 8f21edd1e4
commit d6bb9f934f
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
4 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/programs/yazi.nix
View file

@ -8,7 +8,7 @@ let
bashIntegration = '' bashIntegration = ''
function ya() { function ya() {
tmp="$(mktemp -t "yazi-cwd.XXXXX")" local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp" yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
cd -- "$cwd" cd -- "$cwd"
@ -29,18 +29,14 @@ let
''; '';
nushellIntegration = '' nushellIntegration = ''
def --env ya [args?] { def --env ya [...args] {
let tmp = (mktemp -t "yazi-cwd.XXXXX") let tmp = (mktemp -t "yazi-cwd.XXXXX")
if ($args == null) { yazi ...$args --cwd-file $tmp
yazi --cwd-file $tmp
} else {
yazi $args --cwd-file $tmp
}
let cwd = (open $tmp) let cwd = (open $tmp)
if $cwd != "" and $cwd != $env.PWD { if $cwd != "" and $cwd != $env.PWD {
cd $cwd cd $cwd
} }
rm -f $tmp rm -fp $tmp
} }
''; '';
in { in {

2
tests/modules/programs/yazi/bash-integration-enabled.nix
View file

@ -3,7 +3,7 @@
let let
shellIntegration = '' shellIntegration = ''
function ya() { function ya() {
tmp="$(mktemp -t "yazi-cwd.XXXXX")" local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp" yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
cd -- "$cwd" cd -- "$cwd"

10
tests/modules/programs/yazi/nushell-integration-enabled.nix
View file

@ -2,18 +2,14 @@
let let
shellIntegration = '' shellIntegration = ''
def --env ya [args?] { def --env ya [...args] {
let tmp = (mktemp -t "yazi-cwd.XXXXX") let tmp = (mktemp -t "yazi-cwd.XXXXX")
if ($args == null) { yazi ...$args --cwd-file $tmp
yazi --cwd-file $tmp
} else {
yazi $args --cwd-file $tmp
}
let cwd = (open $tmp) let cwd = (open $tmp)
if $cwd != "" and $cwd != $env.PWD { if $cwd != "" and $cwd != $env.PWD {
cd $cwd cd $cwd
} }
rm -f $tmp rm -fp $tmp
} }
''; '';
in { in {

2
tests/modules/programs/yazi/zsh-integration-enabled.nix
View file

@ -3,7 +3,7 @@
let let
shellIntegration = '' shellIntegration = ''
function ya() { function ya() {
tmp="$(mktemp -t "yazi-cwd.XXXXX")" local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp" yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
cd -- "$cwd" cd -- "$cwd"