From 7d7dd1d21e31fc9646db4c1cb55a041ab25cde7a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 22:45:59 +0200
Subject: [PATCH] modules/dependencies: add plantuml

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

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 6eeac724..57cf0f2d 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -27,6 +27,7 @@ let
       default = "nodejs";
       example = "pkgs.nodejs_22";
     };
+    plantuml.default = "plantuml";
     ripgrep.default = "ripgrep";
     sd.default = "sd";
     sed.default = "gnused";
diff --git a/plugins/by-name/plantuml-syntax/default.nix b/plugins/by-name/plantuml-syntax/default.nix
index 1e1871b0..2a866ec2 100644
--- a/plugins/by-name/plantuml-syntax/default.nix
+++ b/plugins/by-name/plantuml-syntax/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -18,15 +17,18 @@ lib.nixvim.plugins.mkVimPlugin {
     "setMakeprg"
     "executableScript"
   ];
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "plantuml-syntax";
+      packageName = "plantuml";
+    })
+  ];
 
-  extraOptions = {
-    plantumlPackage = lib.mkPackageOption pkgs "plantuml" {
-      nullable = true;
-    };
+  extraConfig = {
+    dependencies.plantuml.enable = lib.mkDefault true;
   };
 
-  extraConfig = cfg: { extraPackages = [ cfg.plantumlPackage ]; };
-
   settingsOptions = {
     set_makeprg = defaultNullOpts.mkFlagInt 1 ''
       Set the makeprg to `plantuml`.