yazi: update shell integrations and docs

michaelpj · Nov 25, 2023 · a462e73 · a462e73
1 parent 8cedd63
commit a462e73
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
@@ -21,18 +21,18 @@ let
     function ya
       set tmp (mktemp -t "yazi-cwd.XXXXX")
       yazi --cwd-file="$tmp"
-      if set cwd (cat -- "$tmp") && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]
+      if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
         cd -- "$cwd"
       end
       rm -f -- "$tmp"
     end
   '';
 
   nushellIntegration = ''
-    def-env ya [] {
-      let tmp = (mktemp -t "yazi-cwd.XXXXX")
+    def --env ya [] {
+      let tmp = $"($env.TEMP)(char path_sep)yazi-cwd." + (random chars -l 5)
       yazi --cwd-file $tmp
-      let cwd = (cat -- $tmp)
+      let cwd = (open $tmp)
       if $cwd != "" and $cwd != $env.PWD {
         cd $cwd
       }
@@ -82,7 +82,7 @@ in {
         Configuration written to
         {file}`$XDG_CONFIG_HOME/yazi/keymap.toml`.
 
-        See <https://github.com/sxyazi/yazi/blob/main/config/docs/keymap.md>
+        See <https://yazi-rs.github.io/docs/configuration/keymap>
         for the full list of options.
       '';
     };
@@ -107,7 +107,7 @@ in {
         Configuration written to
         {file}`$XDG_CONFIG_HOME/yazi/yazi.toml`.
 
-        See <https://github.com/sxyazi/yazi/blob/main/config/docs/yazi.md>
+        See <https://yazi-rs.github.io/docs/configuration/yazi>
         for the full list of options.
       '';
     };
@@ -131,7 +131,7 @@ in {
         Configuration written to
         {file}`$XDG_CONFIG_HOME/yazi/theme.toml`.
 
-        See <https://github.com/sxyazi/yazi/blob/main/config/docs/theme.md>
+        See <https://yazi-rs.github.io/docs/configuration/theme>
         for the full list of options
       '';
     };

diff --git a/tests/modules/programs/yazi/fish-integration-enabled.nix b/tests/modules/programs/yazi/fish-integration-enabled.nix
@@ -5,7 +5,7 @@ let
     function ya
       set tmp (mktemp -t "yazi-cwd.XXXXX")
       yazi --cwd-file="$tmp"
-      if set cwd (cat -- "$tmp") && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]
+      if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
         cd -- "$cwd"
       end
       rm -f -- "$tmp"

diff --git a/tests/modules/programs/yazi/nushell-integration-enabled.nix b/tests/modules/programs/yazi/nushell-integration-enabled.nix
@@ -2,10 +2,10 @@
 
 let
   shellIntegration = ''
-    def-env ya [] {
-      let tmp = (mktemp -t "yazi-cwd.XXXXX")
+    def --env ya [] {
+      let tmp = $"($env.TEMP)(char path_sep)yazi-cwd." + (random chars -l 5)
       yazi --cwd-file $tmp
-      let cwd = (cat -- $tmp)
+      let cwd = (open $tmp)
       if $cwd != "" and $cwd != $env.PWD {
         cd $cwd
       }