plugins: use mk{Neovim,Vim}Plugin's dependencies parameter

Author: GaetanLepage

plugins/by-name/chatgpt/default.nix

@@ -11,6 +11,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   maintainers = [ maintainers.GaetanLepage ];
 
+  dependencies = [ "curl" ];
+
   # TODO: added 2025-04-06, remove after 25.05
   imports = [
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -19,8 +21,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
     })
   ];
 
-  extraConfig = cfg: { dependencies.curl.enable = lib.mkDefault true; };
-
   settingsOptions = {
     api_key_cmd = helpers.defaultNullOpts.mkStr null ''
       The path and arguments to an executable that returns the API key via stdout.

plugins/by-name/committia/default.nix

@@ -13,6 +13,8 @@ lib.nixvim.plugins.mkVimPlugin {
 
   maintainers = [ lib.maintainers.alisonjenkins ];
 
+  dependencies = [ "git" ];
+
   imports = [
     # TODO: added 2025-04-06, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -55,8 +57,4 @@ lib.nixvim.plugins.mkVimPlugin {
       Minimum height of a status window.
     '';
   };
-
-  extraConfig = cfg: {
-    dependencies.git.enable = lib.mkDefault true;
-  };
 }

plugins/by-name/cornelis/default.nix

@@ -8,6 +8,8 @@ lib.nixvim.plugins.mkVimPlugin {
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
+  dependencies = [ "cornelis" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -16,10 +18,6 @@ lib.nixvim.plugins.mkVimPlugin {
     })
   ];
 
-  extraConfig = {
-    dependencies.cornelis.enable = lib.mkDefault true;
-  };
-
   settingsOptions = {
     use_global_binary = defaultNullOpts.mkFlagInt 0 ''
       Whether to use global binary instead of stack.

plugins/by-name/direnv/default.nix

@@ -13,6 +13,8 @@ lib.nixvim.plugins.mkVimPlugin {
 
   maintainers = [ lib.maintainers.alisonjenkins ];
 
+  dependencies = [ "direnv" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -43,8 +45,4 @@ lib.nixvim.plugins.mkVimPlugin {
       Stop echoing output from Direnv command.
     '';
   };
-
-  extraConfig = {
-    dependencies.direnv.enable = lib.mkDefault true;
-  };
 }

plugins/by-name/distant/default.nix

@@ -17,6 +17,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   setup = ":setup";
 
+  dependencies = [ "distant" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -25,10 +27,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
     })
   ];
 
-  extraConfig = {
-    dependencies.distant.enable = lib.mkDefault true;
-  };
-
   settingsOptions = {
     buffer = {
       watch = {

plugins/by-name/flutter-tools/default.nix

@@ -10,6 +10,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   maintainers = [ lib.maintainers.khaneliman ];
 
+  dependencies = [ "flutter" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -19,8 +21,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
   ];
 
   extraConfig = cfg: {
-    dependencies.flutter.enable = lib.mkDefault true;
-
     warnings = lib.nixvim.mkWarnings "plugins.flutter-tools" {
       when =
         (cfg.settings ? debugger.enable)

plugins/by-name/fugitive/default.nix

@@ -9,6 +9,8 @@ lib.nixvim.plugins.mkVimPlugin {
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
+  dependencies = [ "git" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -18,8 +20,4 @@ lib.nixvim.plugins.mkVimPlugin {
   ];
 
   # In typical tpope fashion, this plugin has no config options
-
-  extraConfig = {
-    dependencies.git.enable = lib.mkDefault true;
-  };
 }

plugins/by-name/fzf-lua/default.nix

@@ -36,6 +36,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   inherit settingsOptions settingsExample;
 
+  dependencies = [ "fzf" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -130,8 +132,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
           enable = lib.mkOverride 1490 true;
         };
 
-    dependencies.fzf.enable = lib.mkDefault true;
-
     plugins.fzf-lua.settings.__unkeyed_profile = cfg.profile;
 
     keymaps = mapAttrsToList (

plugins/by-name/git-conflict/default.nix

@@ -10,6 +10,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   maintainers = [ maintainers.GaetanLepage ];
 
+  dependencies = [ "git" ];
+
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -18,10 +20,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
     })
   ];
 
-  extraConfig = {
-    dependencies.git.enable = lib.mkDefault true;
-  };
-
   settingsOptions = {
     default_mappings =
       helpers.defaultNullOpts.mkNullable (with types; either bool (attrsOf str)) true

plugins/by-name/git-worktree/default.nix

@@ -13,6 +13,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   maintainers = [ lib.maintainers.khaneliman ];
 
+  dependencies = [ "git" ];
+
   # TODO: added 2025-04-06, remove after 25.05
   imports = [
     (lib.nixvim.mkRemovedPackageOptionModule {
@@ -70,8 +72,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
       '';
     };
 
-    dependencies.git.enable = lib.mkDefault true;
-
     plugins.telescope.enabledExtensions = lib.mkIf cfg.enableTelescope [ "git_worktree" ];
 
     globals.git_worktree = cfg.settings;