diff --git a/configuration.nix b/configuration.nix
index 01a99524..cc39d3ff 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -112,7 +112,7 @@ isMaximal: {
     snippets.luasnip.enable = true;
 
     filetree = {
-      neo-tree = {
+      nvimTree = {
         enable = true;
       };
     };
diff --git a/modules/plugins/filetree/neo-tree/config.nix b/modules/plugins/filetree/neo-tree/config.nix
index d2a114f3..208fe29a 100644
--- a/modules/plugins/filetree/neo-tree/config.nix
+++ b/modules/plugins/filetree/neo-tree/config.nix
@@ -4,7 +4,6 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.filetree.neo-tree;
 in {
@@ -26,26 +25,6 @@ in {
       };
 
       visuals.nvim-web-devicons.enable = true;
-      # from https://github.com/nvim-neo-tree/neo-tree.nvim/discussions/1326
-      pluginRC.neo-tree =
-        mkIf (cfg.setupOpts.filesystem.hijack_netrw_behavior != "disabled" && config.vim.lazy.enable)
-        (entryAnywhere ''
-          vim.api.nvim_create_autocmd("BufEnter", {
-            group = vim.api.nvim_create_augroup("load_neo_tree", {}),
-            desc = "Loads neo-tree when openning a directory",
-            callback = function(args)
-              local stats = vim.uv.fs_stat(args.file)
-
-              if not stats or stats.type ~= "directory" then
-                return
-              end
-
-              require("lz.n").trigger_load("neo-tree-nvim")
-
-              return true
-            end,
-          })
-        '');
     };
   };
 }
diff --git a/modules/plugins/filetree/neo-tree/neo-tree.nix b/modules/plugins/filetree/neo-tree/neo-tree.nix
index 29199d4b..b1ec2601 100644
--- a/modules/plugins/filetree/neo-tree/neo-tree.nix
+++ b/modules/plugins/filetree/neo-tree/neo-tree.nix
@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib.types) bool str enum either listOf;
+  inherit (lib.types) bool str int submodule enum either listOf;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
@@ -150,14 +150,6 @@ in {
           A list of filetypes that should not be replaced when opening a file
         '';
       };
-
-      filesystem = {
-        hijack_netrw_behavior = mkOption {
-          type = enum ["disabled" "open_default" "open_current"];
-          default = "open_default";
-          description = "Hijack Netrw behavior";
-        };
-      };
     };
   };
 }
diff --git a/modules/plugins/filetree/nvimtree/config.nix b/modules/plugins/filetree/nvimtree/config.nix
index 40df74b2..30cc680b 100644
--- a/modules/plugins/filetree/nvimtree/config.nix
+++ b/modules/plugins/filetree/nvimtree/config.nix
@@ -24,7 +24,6 @@ in {
         package = "nvim-tree-lua";
         setupModule = "nvim-tree";
         inherit (cfg) setupOpts;
-
         cmd = ["NvimTreeClipboard" "NvimTreeClose" "NvimTreeCollapse" "NvimTreeCollapseKeepBuffers" "NvimTreeFindFile" "NvimTreeFindFileToggle" "NvimTreeFocus" "NvimTreeHiTest" "NvimTreeOpen" "NvimTreeRefresh" "NvimTreeResize" "NvimTreeToggle"];
         keys = [
           (mkLznBinding ["n"] cfg.mappings.toggle ":NvimTreeToggle<cr>" mappings.toggle.description)
@@ -34,7 +33,7 @@ in {
         ];
       };
 
-      pluginRC.nvim-tree = entryAnywhere ''
+      pluginRC.nvimtreelua = entryAnywhere ''
         ${
           optionalString cfg.setupOpts.disable_netrw ''
             -- disable netrew completely
@@ -43,24 +42,6 @@ in {
           ''
         }
 
-        ${optionalString (config.vim.lazy.enable && cfg.setupOpts.hijack_netrw && !cfg.openOnSetup) ''
-          vim.api.nvim_create_autocmd("BufEnter", {
-            group = vim.api.nvim_create_augroup("load_nvim_tree", {}),
-            desc = "Loads nvim-tree when openning a directory",
-            callback = function(args)
-              local stats = vim.uv.fs_stat(args.file)
-
-              if not stats or stats.type ~= "directory" then
-                return
-              end
-
-              require("lz.n").trigger_load("nvim-tree-lua")
-
-              return true
-            end,
-          })
-        ''}
-
         ${
           optionalString cfg.openOnSetup ''
             ${optionalString config.vim.lazy.enable ''require('lz.n').trigger_load("nvim-tree-lua")''}
diff --git a/modules/wrapper/lazy/config.nix b/modules/wrapper/lazy/config.nix
index 9675e030..36c18a9e 100644
--- a/modules/wrapper/lazy/config.nix
+++ b/modules/wrapper/lazy/config.nix
@@ -25,15 +25,6 @@
     (removeAttrs spec ["package" "setupModule" "setupOpts" "keys"])
     // {
       "@1" = name;
-      beforeAll =
-        if spec.beforeAll != null
-        then
-          mkLuaInline ''
-            function()
-              ${spec.beforeAll}
-            end
-          ''
-        else null;
       before =
         if spec.before != null
         then