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

---
 modules/dependencies.nix          |  1 +
 plugins/by-name/godot/default.nix | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 31c1e5e6..0a3668af 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -28,6 +28,7 @@ let
     };
     glow.default = "glow";
     go.default = "go";
+    godot.default = "godot_4";
     lazygit.default = "lazygit";
     lean.default = "lean4";
     ledger.default = "ledger";
diff --git a/plugins/by-name/godot/default.nix b/plugins/by-name/godot/default.nix
index 8f4f7f14..988e5e2e 100644
--- a/plugins/by-name/godot/default.nix
+++ b/plugins/by-name/godot/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -13,12 +12,13 @@ lib.nixvim.plugins.mkVimPlugin {
 
   maintainers = [ maintainers.GaetanLepage ];
 
-  extraOptions = {
-    godotPackage = lib.mkPackageOption pkgs "godot" {
-      nullable = true;
-      default = "godot_4";
-    };
-  };
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "godot";
+      packageName = "godot";
+    })
+  ];
 
   settingsOptions = {
     executable = helpers.defaultNullOpts.mkStr "godot" ''
@@ -30,5 +30,7 @@ lib.nixvim.plugins.mkVimPlugin {
     executable = "godot";
   };
 
-  extraConfig = cfg: { extraPackages = [ cfg.godotPackage ]; };
+  extraConfig = {
+    dependencies.godot.enable = lib.mkDefault true;
+  };
 }