treewide: update lazy.plugins syntax

modules/plugins/comments/comment-nvim/config.nix

@@ -15,8 +15,7 @@ in {
       "comment-nvim"
     ];
 
-    vim.lazy.plugins = [
-      {
+    vim.lazy.plugins.comment-nvim = {
       package = "comment-nvim";
       setupModule = "Comment";
       inherit (cfg) setupOpts;
@@ -41,7 +40,6 @@ in {
         (mkLznBinding ["x"] cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
         (mkLznBinding ["x"] cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
       ];
-      }
-    ];
+    };
   };
 }

modules/plugins/debugger/nvim-dap/config.nix

@@ -54,8 +54,7 @@ in {
       vim = {
         startPlugins = ["nvim-nio"];
 
-        lazy.plugins = [
-          {
+        lazy.plugins.nvim-dap-ui = {
           package = "nvim-dap-ui";
           setupModule = "dapui";
           setupOpts = {};
@@ -63,8 +62,7 @@ in {
           keys = [
             (mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end")
           ];
-          }
-        ];
+        };
 
         pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
           optionalString cfg.ui.autoStart ''

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

@@ -16,15 +16,13 @@ in {
         "nui-nvim" # ui library
       ];
 
-      lazy.plugins = [
-        {
+      lazy.plugins.neo-tree-nvim = {
         package = "neo-tree-nvim";
         setupModule = "neo-tree";
         inherit (cfg) setupOpts;
 
         cmd = ["Neotree"];
-        }
-      ];
+      };
 
       visuals.nvimWebDevicons.enable = true;
     };

modules/plugins/filetree/nvimtree/config.nix

@@ -15,12 +15,12 @@
   inherit (self.options.vim.filetree.nvimTree) mappings;
 in {
   config = mkIf cfg.enable {
-    vim.binds.whichKey.register = pushDownDefault {
+    vim = {
+      binds.whichKey.register = pushDownDefault {
         "<leader>t" = "+NvimTree";
       };
 
-    vim.lazy.plugins = [
-      {
+      lazy.plugins.nvim-tree-lua = {
         package = "nvim-tree-lua";
         setupModule = "nvim-tree";
         inherit (cfg) setupOpts;
@@ -31,10 +31,9 @@ in {
           (mkLznBinding ["n"] cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description)
           (mkLznBinding ["n"] cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description)
         ];
-      }
-    ];
+      };
 
-    vim.pluginRC.nvimtreelua = entryAnywhere ''
+      pluginRC.nvimtreelua = entryAnywhere ''
         ${
           optionalString cfg.setupOpts.disable_netrw ''
             -- disable netrew completely
@@ -85,4 +84,5 @@ in {
         }
       '';
     };
+  };
 }

modules/plugins/lsp/trouble/config.nix

@@ -14,8 +14,7 @@
 in {
   config = mkIf (cfg.enable && cfg.trouble.enable) {
     vim = {
-      lazy.plugins = [
-        {
+      lazy.plugins.trouble = {
         package = "trouble";
         setupModule = "trouble";
         inherit (cfg.trouble) setupOpts;
@@ -29,8 +28,7 @@ in {
           (mkSetLznBinding mappings.quickfix "<cmd>TroubleToggle quickfix<CR>")
           (mkSetLznBinding mappings.locList "<cmd>TroubleToggle loclist<CR>")
         ];
-        }
-      ];
+      };
 
       binds.whichKey.register = pushDownDefault {
         "<leader>l" = "Trouble";

modules/plugins/terminal/toggleterm/config.nix

@@ -14,8 +14,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      lazy.plugins = [
-        {
+      lazy.plugins.toggleterm-nvim = {
         package = "toggleterm-nvim";
         cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"];
         keys = [
@@ -45,8 +44,7 @@ in {
 
           vim.keymap.set('n', ${toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = '${lazygitMapDesc}'})
         '';
-        }
-      ];
+      };
     };
   };
 }

modules/plugins/utility/binds/cheatsheet/config.nix

@@ -9,15 +9,13 @@
   cfg = config.vim.binds.cheatsheet;
 in {
   config = mkIf cfg.enable {
-    vim.lazy.plugins = [
-      {
+    vim.lazy.plugins.cheatsheet-nvim = {
       package = "cheatsheet-nvim";
       setupModule = "cheatsheet";
       setupOpts = {};
       cmd = ["Cheatsheet" "CheatsheetEdit"];
 
       before = optionalString config.vim.lazy.enable "require('lz.n').trigger_load('telescope')";
-      }
-    ];
+    };
   };
 }

modules/plugins/utility/diffview/config.nix

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

modules/plugins/utility/icon-picker/config.nix

@@ -10,8 +10,7 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["dressing-nvim"];
 
-    vim.lazy.plugins = [
-      {
+    vim.lazy.plugins.icon-picker-nvim = {
       package = "icon-picker-nvim";
       setupModule = "icon-picker";
       setupOpts = {
@@ -19,7 +18,6 @@ in {
       };
 
       cmd = ["IconPickerInsert" "IconPickerNormal" "IconPickerYank"];
-      }
-    ];
+    };
   };
 }

modules/plugins/utility/motion/leap/config.nix

@@ -11,8 +11,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = ["vim-repeat"];
-      lazy.plugins = [
-        {
+      lazy.plugins.leap-nvim = {
         package = "leap-nvim";
         keys = [
           (mkLznBinding ["n" "o" "x"] cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
@@ -54,8 +53,7 @@ in {
             },
           }
         '';
-        }
-      ];
+      };
     };
   };
 }

modules/plugins/utility/surround/config.nix

@@ -30,8 +30,7 @@ in {
       startPlugins = ["nvim-surround"];
       pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
 
-      lazy.plugins = [
-        {
+      lazy.plugins.nvim-surround = {
         package = "nvim-surround";
         setupModule = "nvim-surround";
         inherit (cfg) setupOpts;
@@ -48,8 +47,7 @@ in {
             change
             change_line
           ]);
-        }
-      ];
+      };
 
       utility.surround.setupOpts.keymaps = mkIf cfg.useVendoredKeybindings vendoredKeybinds;
     };

modules/plugins/utility/telescope/config.nix

@@ -20,8 +20,7 @@ in {
     vim = {
       startPlugins = ["plenary-nvim"];
 
-      lazy.plugins = [
-        {
+      lazy.plugins.telescope = {
         package = "telescope";
         setupModule = "telescope";
         inherit (cfg) setupOpts;
@@ -69,8 +68,7 @@ in {
               (mkSetLznBinding mappings.findProjects "<cmd Telescope projects<CR>")
             ]
           );
-        }
-      ];
+      };
 
       binds.whichKey.register = pushDownDefault {
         "<leader>f" = "+Telescope";

modules/plugins/visuals/fidget/config.nix

@@ -8,13 +8,11 @@
   cfg = config.vim.visuals.fidget-nvim;
 in {
   config = mkIf cfg.enable {
-    vim.lazy.plugins = [
-      {
+    vim.lazy.plugins.fidget-nvim = {
       package = "fidget-nvim";
       setupModule = "fidget";
       event = "LspAttach";
       inherit (cfg) setupOpts;
-      }
-    ];
+    };
   };
 }