From 06acf3f103d99d9d7fc7823c66ec96bf900dde4a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 23:37:57 +0200
Subject: [PATCH] modules/dependencies: add flutter

---
 modules/dependencies.nix                  |  1 +
 plugins/by-name/flutter-tools/default.nix | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index c7f29d33..31c1e5e6 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -15,6 +15,7 @@ let
     direnv.default = "direnv";
     distant.default = "distant";
     fish.default = "fish";
+    flutter.default = "flutter";
     fzf = {
       default = "fzf";
       example = "pkgs.skim";
diff --git a/plugins/by-name/flutter-tools/default.nix b/plugins/by-name/flutter-tools/default.nix
index a7655d21..69328044 100644
--- a/plugins/by-name/flutter-tools/default.nix
+++ b/plugins/by-name/flutter-tools/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   config,
   ...
 }:
@@ -11,13 +10,16 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   maintainers = [ lib.maintainers.khaneliman ];
 
-  extraOptions = {
-    flutterPackage = lib.mkPackageOption pkgs "flutter" {
-      nullable = true;
-    };
-  };
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "flutter-tools";
+      packageName = "flutter";
+    })
+  ];
+
   extraConfig = cfg: {
-    extraPackages = [ cfg.flutterPackage ];
+    dependencies.flutter.enable = lib.mkDefault true;
 
     warnings = lib.nixvim.mkWarnings "plugins.flutter-tools" {
       when =