configuration.nix

@@ -114,7 +114,6 @@ isMaximal: {
     filetree = {
       nvimTree = {
         enable = true;
-        openOnSetup = false;
       };
     };
 

modules/plugins/utility/diffview/config.nix

@@ -8,16 +8,9 @@
   cfg = config.vim.utility.diffview-nvim;
 in {
   config = mkIf cfg.enable {
-    vim = {
-      startPlugins = ["plenary-nvim"];
-      lazy.plugins = [
-        {
-          package = "diffview-nvim";
-          cmd = ["DiffviewClose" "DiffviewFileHistory" "DiffviewFocusFiles" "DiffviewLog" "DiffviewOpen" "DiffviewRefresh" "DiffviewToggleFiles"];
-          setupModule = "diffview";
-          inherit (cfg) setupOpts;
-        }
+    vim.startPlugins = [
+      "diffview-nvim"
+      "plenary-nvim"
     ];
   };
-  };
 }

modules/plugins/utility/diffview/diffview.nix

@@ -1,9 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.utility.diffview-nvim = {
     enable = mkEnableOption "diffview-nvim: cycle through diffs for all modified files for any git rev";
-    setupOpts = mkPluginSetupOption "Fidget" {};
   };
 }

modules/plugins/visuals/fidget/config.nix

@@ -4,19 +4,16 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.visuals.fidget-nvim;
 in {
   config = mkIf cfg.enable {
-    vim.lazy = {
-      plugins = [
-        {
-          package = "fidget-nvim";
-          setupModule = "fidget";
-          event = "LspAttach";
-          inherit (cfg) setupOpts;
-        }
-      ];
-    };
+    vim.startPlugins = ["fidget-nvim"];
+
+    vim.pluginRC.fidget-nvim = entryAnywhere ''
+      require'fidget'.setup(${toLuaObject cfg.setupOpts})
+    '';
   };
 }