lib/types/plugins.nix

@@ -65,27 +65,10 @@
       #   type=  str;
       # }
 
-      # Non-lz.n options
-
       package = mkOption {
         type = pluginType;
-        description = "Plugin package";
       };
 
-      setupModule = mkOption {
-        type = nullOr str;
-        description = "Lua module to run setup function on.";
-        default = null;
-      };
-
-      setupOpts = mkOption {
-        type = submodule {freeformType = attrsOf anything;};
-        description = "Options to pass to the setup function";
-        default = {};
-      };
-
-      # lz.n options
-
       before = mkOption {
         type = nullOr luaInline;
         description = "Code to run before plugin is loaded";

modules/default.nix

@@ -88,7 +88,10 @@ inputs: {
 
   # built (or "normalized") plugins that are modified
   builtStartPlugins = buildConfigPlugins vimOptions.startPlugins;
-  builtOptPlugins = map (package: package // {optional = true;}) (buildConfigPlugins vimOptions.optPlugins);
+  builtOptPlugins = map (package: {
+    plugin = package;
+    optional = true;
+  }) (buildConfigPlugins vimOptions.optPlugins);
 
   # additional Lua and Python3 packages, mapped to their respective functions
   # to conform to the format makeNeovimConfig expects. end user should

modules/plugins/filetree/nvimtree/config.nix

@@ -16,6 +16,8 @@
   inherit (self.options.vim.filetree.nvimTree) mappings;
 in {
   config = mkIf cfg.enable {
+    vim.startPlugins = ["nvim-tree-lua"];
+
     vim.maps.normal = mkMerge [
       (mkBinding cfg.mappings.toggle ":NvimTreeToggle<cr>" mappings.toggle.description)
       (mkBinding cfg.mappings.refresh ":NvimTreeRefresh<cr>" mappings.refresh.description)
@@ -27,17 +29,6 @@ in {
       "<leader>t" = "+NvimTree";
     };
 
-    vim.lazy = {
-      plugins = {
-        nvim-tree-lua = {
-          package = "nvim-tree-lua";
-          setupModule = "nvim-tree";
-          inherit (cfg) setupOpts;
-          cmd = ["NvimTreeClipboard" "NvimTreeClose" "NvimTreeCollapse" "NvimTreeCollapseKeepBuffers" "NvimTreeFindFile" "NvimTreeFindFileToggle" "NvimTreeFocus" "NvimTreeHiTest" "NvimTreeOpen" "NvimTreeRefresh" "NvimTreeResize" "NvimTreeToggle"];
-        };
-      };
-    };
-
     vim.pluginRC.nvimtreelua = entryAnywhere ''
       ${
         optionalString cfg.setupOpts.disable_netrw ''
@@ -47,6 +38,8 @@ in {
         ''
       }
 
+      require'nvim-tree'.setup(${toLuaObject cfg.setupOpts})
+
       ${
         optionalString cfg.openOnSetup ''
           -- autostart behaviour

modules/wrapper/lazy/config.nix

@@ -3,29 +3,15 @@
   config,
   ...
 }: let
-  inherit (builtins) toJSON;
   inherit (lib.modules) mkIf;
   inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.strings) optionalString;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.dag) entryAnywhere;
   cfg = config.vim.lazy;
 
-  toLuaLznSpec = name: spec:
+  toLuaLznSpec = name: plugin:
-    (removeAttrs spec ["package" "setupModule" "setupOpts"])
+    (removeAttrs plugin ["package"])
-    // {
+    // {"@1" = name;};
-      "@1" = name;
-      after = mkLuaInline ''
-        function()
-          ${
-          optionalString (spec.setupModule != null)
-          "require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
-        }
-          ${optionalString (spec.after != null) spec.after}
-        end
-      '';
-    };
   lznSpecs = mapAttrsToList toLuaLznSpec cfg.plugins;
 in {
   config.vim = mkIf cfg.enable {