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

---
 modules/dependencies.nix                      |  1 +
 plugins/by-name/wezterm/default.nix           | 19 ++++++------
 .../plugins/by-name/wezterm/default.nix       | 30 +++++++------------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 8c0a5206..fd61f560 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -44,6 +44,7 @@ let
     typst.default = "typst";
     ueberzug.default = "ueberzugpp";
     websocat.default = "websocat";
+    wezterm.default = "wezterm";
     which.default = "which";
     yazi.default = "yazi";
     yq.default = "yq";
diff --git a/plugins/by-name/wezterm/default.nix b/plugins/by-name/wezterm/default.nix
index 9686039b..4843ad2d 100644
--- a/plugins/by-name/wezterm/default.nix
+++ b/plugins/by-name/wezterm/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   ...
 }:
 let
@@ -13,11 +12,13 @@ lib.nixvim.plugins.neovim.mkNeovimPlugin {
 
   maintainers = [ lib.maintainers.khaneliman ];
 
-  extraOptions = {
-    weztermPackage = lib.mkPackageOption pkgs "wezterm" {
-      nullable = true;
-    };
-  };
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "wezterm";
+      packageName = "wezterm";
+    })
+  ];
 
   settingsOptions = {
     create_commands = defaultNullOpts.mkBool true ''
@@ -29,9 +30,7 @@ lib.nixvim.plugins.neovim.mkNeovimPlugin {
     create_commands = false;
   };
 
-  extraConfig = cfg: {
-    extraPackages = [
-      cfg.weztermPackage
-    ];
+  extraConfig = {
+    dependencies.wezterm.enable = lib.mkDefault true;
   };
 }
diff --git a/tests/test-sources/plugins/by-name/wezterm/default.nix b/tests/test-sources/plugins/by-name/wezterm/default.nix
index 97de02c0..c6560868 100644
--- a/tests/test-sources/plugins/by-name/wezterm/default.nix
+++ b/tests/test-sources/plugins/by-name/wezterm/default.nix
@@ -1,23 +1,15 @@
 {
-  empty =
-    { pkgs, ... }:
-    {
-      plugins.wezterm = {
-        enable = true;
-        weztermPackage = pkgs.wezterm;
-      };
-    };
-
-  defaults =
-    { pkgs, ... }:
-    {
-      plugins.wezterm = {
-        enable = true;
-        weztermPackage = pkgs.wezterm;
-
-        settings = {
-          create_commands = true;
-        };
+  empty = {
+    plugins.wezterm.enable = true;
+  };
+
+  defaults = {
+    plugins.wezterm = {
+      enable = true;
+
+      settings = {
+        create_commands = true;
       };
     };
+  };
 }