Merge 7f5c33605d into b6785f8218

modules/plugins/filetree/neo-tree/config.nix

@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.strings) optionalString;
 
   cfg = config.vim.filetree.neo-tree;
 in {
@@ -22,13 +22,10 @@ in {
         setupModule = "neo-tree";
         inherit (cfg) setupOpts;
 
-        cmd = ["Neotree"];
-        event = [];
-      };
-
-      pluginRC = mkIf (cfg.setupOpts.filesystem.hijack_netrw_behavior != "disabled" && config.vim.lazy.enable) {
+        beforeAll =
+          optionalString (cfg.setupOpts.filesystem.hijack_netrw_behavior != "disabled")
           # from https://github.com/nvim-neo-tree/neo-tree.nvim/discussions/1326
-        neo-tree = entryAnywhere ''
+          ''
             vim.api.nvim_create_autocmd("BufEnter", {
               group = vim.api.nvim_create_augroup("load_neo_tree", {}),
               desc = "Loads neo-tree when openning a directory",
@@ -45,6 +42,8 @@ in {
               end,
             })
           '';
+        cmd = ["Neotree"];
+        event = [];
       };
 
       visuals.nvim-web-devicons.enable = true;

modules/plugins/filetree/nvimtree/config.nix

@@ -32,9 +32,8 @@ in {
           (mkLznBinding ["n"] cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description)
           (mkLznBinding ["n"] cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description)
         ];
-      };
 
-      pluginRC.nvim-tree = entryAnywhere ''
+        beforeAll = ''
           ${
             optionalString cfg.setupOpts.disable_netrw ''
               -- disable netrew completely
@@ -43,7 +42,7 @@ in {
             ''
           }
 
-        ${optionalString (config.vim.lazy.enable && cfg.setupOpts.hijack_netrw && !cfg.openOnSetup) ''
+          ${optionalString (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",
@@ -104,4 +103,5 @@ in {
         '';
       };
     };
+  };
 }