eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2025-01-22 17:09:52 +01:00
Code Issues Releases Wiki Activity

yazi: improve fish integration

Browse source 
Calls yazi as `command yazi`, allowing to use "yazi" as
`shellWrapperName`. Also defines the wrapper with
`programs.fish.functions` instead of `interactiveShellInit`.
This commit is contained in:
Ismaïl Senhaji 2025-01-14 17:52:56 +01:00 committed by Robert Helgesson
parent 96dee79b17
commit 4481a16d1a
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
4 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/misc/news.nix
View file

@ -1960,6 +1960,19 @@ in {
as well as wf-shell. as well as wf-shell.
''; '';
} }
{
time = "2025-01-21T17:28:13+00:00";
condition = with config.programs.yazi; enable && enableFishIntegration;
message = ''
Yazi's fish shell integration wrapper now calls the 'yazi' executable
directly, ignoring any shell aliases with the same name.
Your configuration may break if you rely on the wrapper calling a
'yazi' alias.
'';
}
]; ];
}; };
} }

8
modules/programs/yazi.nix
View file

@ -18,14 +18,12 @@ let
''; '';
fishIntegration = '' fishIntegration = ''
function ${cfg.shellWrapperName} set -l tmp (mktemp -t "yazi-cwd.XXXXX")
set tmp (mktemp -t "yazi-cwd.XXXXX") command yazi $argv --cwd-file="$tmp"
yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
builtin cd -- "$cwd" builtin cd -- "$cwd"
end end
rm -f -- "$tmp" rm -f -- "$tmp"
end
''; '';
nushellIntegration = '' nushellIntegration = ''
@ -202,7 +200,7 @@ in {
programs.zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration; programs.zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration;
programs.fish.interactiveShellInit = programs.fish.functions.${cfg.shellWrapperName} =
mkIf cfg.enableFishIntegration fishIntegration; mkIf cfg.enableFishIntegration fishIntegration;
programs.nushell.extraConfig = programs.nushell.extraConfig =

19
tests/modules/programs/yazi/fish-integration-enabled.nix
View file

@ -1,27 +1,18 @@
{ ... }: { config, ... }:
let {
shellIntegration = ''
function yy
set tmp (mktemp -t "yazi-cwd.XXXXX")
yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
builtin cd -- "$cwd"
end
rm -f -- "$tmp"
end
'';
in {
programs.fish.enable = true; programs.fish.enable = true;
programs.yazi = { programs.yazi = {
enable = true; enable = true;
shellWrapperName = "yy";
enableFishIntegration = true; enableFishIntegration = true;
}; };
test.stubs.yazi = { }; test.stubs.yazi = { };
nmt.script = '' nmt.script = ''
assertFileContains home-files/.config/fish/config.fish '${shellIntegration}' assertFileContent home-files/.config/fish/functions/${config.programs.yazi.shellWrapperName}.fish \
${./fish-integration-expected.fish}
''; '';
} }

8
tests/modules/programs/yazi/fish-integration-expected.fish Normal file
View file

@ -0,0 +1,8 @@
function yy
set -l tmp (mktemp -t "yazi-cwd.XXXXX")
command yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
builtin cd -- "$cwd"
end
rm -f -- "$tmp"
end