diff --git a/modules/home/programs/terminal/editors/neovim/autocommands.nix b/modules/home/programs/terminal/editors/neovim/autocommands.nix
index 2e9649faf..ca328128e 100644
--- a/modules/home/programs/terminal/editors/neovim/autocommands.nix
+++ b/modules/home/programs/terminal/editors/neovim/autocommands.nix
@@ -11,20 +11,20 @@ _: {
     # }
 
     # Open Neo-Tree on first buffer
-    {
-      event = "BufWinEnter";
-      callback = {
-        __raw = # lua
-          ''
-            function(table)
-              if vim.api.nvim_buf_get_name(0) ~= "" and not vim.g.first_buffer_opened then
-                vim.g.first_buffer_opened = true
-                vim.api.nvim_exec('Neotree show filesystem left', true)
-              end
-            end
-          '';
-      };
-    }
+    # {
+    #   event = "BufWinEnter";
+    #   callback = {
+    #     __raw = # lua
+    #       ''
+    #         function(table)
+    #           if vim.api.nvim_buf_get_name(0) ~= "" and not vim.g.first_buffer_opened then
+    #             vim.g.first_buffer_opened = true
+    #             vim.api.nvim_exec('Neotree show filesystem left', true)
+    #           end
+    #         end
+    #       '';
+    #   };
+    # }
 
     # Enable spellcheck for some filetypes
     {
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/neo-tree.nix b/modules/home/programs/terminal/editors/neovim/plugins/neo-tree.nix
index ab385e0af..67e177d61 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/neo-tree.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/neo-tree.nix
@@ -1,6 +1,7 @@
-_: {
+{ config, lib, ... }:
+{
   programs.nixvim = {
-    keymaps = [
+    keymaps = lib.mkIf config.programs.nixvim.plugins.neo-tree.enable [
       {
         mode = "n";
         key = "<leader>e";
@@ -13,7 +14,7 @@ _: {
     ];
 
     plugins.neo-tree = {
-      enable = true;
+      enable = false;
 
       closeIfLastWindow = true;
 
diff --git a/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix b/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix
index 7956aa87a..67099a8d7 100644
--- a/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix
+++ b/modules/home/programs/terminal/editors/neovim/plugins/yazi.nix
@@ -16,10 +16,10 @@
     keymaps = [
       {
         mode = "n";
-        key = "<leader>ty";
+        key = "<leader>e";
         action = ":Yazi<CR>";
         options = {
-          desc = "Open Yazi";
+          desc = "Yazi toggle";
           silent = true;
         };
       }