From 62a382f2f5477519a146aac9f1986b4e0643ac51 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Fri, 4 Apr 2025 15:52:29 -0400
Subject: [PATCH] yazi plugin refactor and cache

---
 flake.lock                    | 12 ++++++------
 hosts/eddie/configuration.nix |  2 ++
 modules/home/yazi.nix         | 14 ++++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index fa685ec..4d04ed4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -744,11 +744,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1743778191,
-        "narHash": "sha256-Fc4kJeTawHVUd+TTpqLJRvvNusTTwqWE1vLz9IpH0NA=",
+        "lastModified": 1743791363,
+        "narHash": "sha256-hGETu0Ilugf0f7S5fFETUP+sS0ATrKcm+7YHs7GBwx4=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "612390f7f196eec4b832e3fca17719d412f5f69c",
+        "rev": "f160e322673614c928e1187c268add9ef038a513",
         "type": "github"
       },
       "original": {
@@ -981,11 +981,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1743576891,
-        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
+        "lastModified": 1743703532,
+        "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
+        "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
         "type": "github"
       },
       "original": {
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 4dc934e..e893725 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -59,10 +59,12 @@
       substituters = [
         "https://nix-community.cachix.org"
         "https://cache.garnix.io"
+        "https://yazi.cachix.org"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k="
       ];
     };
 
diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix
index 712f8ed..bd724bf 100644
--- a/modules/home/yazi.nix
+++ b/modules/home/yazi.nix
@@ -10,10 +10,9 @@
       officialPluginsNames = [
         "chmod"
         "diff"
-        "smart-filter"
         "git"
         "mount"
-        "toggle-pane"
+        # "toggle-pane"
       ];
 
       officialPluginsSrc = pkgs.fetchgit {
@@ -82,9 +81,9 @@
 
         { on = ["g" "l"]; run = "plugin lazygit"; desc = "lazygit"; }
 
-        { on = ["t" "p"]; run = "plugin toggle-pane min-parent"; desc = "Toggle parent"; }
-        { on = ["t" "c"]; run = "plugin toggle-pane min-current"; desc = "Toggle current"; }
-        { on = ["t" "r"]; run = "plugin toggle-pane min-preview"; desc = "Toggle preview"; }
+        # { on = ["t" "p"]; run = "plugin toggle-pane min-parent"; desc = "Toggle parent"; }
+        # { on = ["t" "c"]; run = "plugin toggle-pane min-current"; desc = "Toggle current"; }
+        # { on = ["t" "r"]; run = "plugin toggle-pane min-preview"; desc = "Toggle preview"; }
 
         { on = "<C-t>"; run ="tab_create"; }
         { on = "<C-w>"; run ="tab_close"; }
@@ -105,8 +104,11 @@
         { on = ["d" "d"]; run = "remove"; desc = "Delete files/folders"; }
         { on = ["d" "u"]; run = "plugin restore"; desc = "Restore last deleted files/folders"; }
 
-        { on = "f"; run = "plugin smart-filter"; desc = "Find file"; }
+        { on = "f"; run = "filter --smart"; desc = "Find file"; }
         { on = "F"; run = "find --smart"; desc = "Find file"; }
+
+        { on = "z"; run = "plugin zoxide"; }
+        { on = "Z"; run = "plugin fzf"; }
       ];
     };
     settings = {