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

---
 modules/dependencies.nix          |  1 +
 plugins/by-name/papis/default.nix | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 5d267e92..8c0a5206 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -46,6 +46,7 @@ let
     websocat.default = "websocat";
     which.default = "which";
     yazi.default = "yazi";
+    yq.default = "yq";
     zk.default = "zk";
   };
 
diff --git a/plugins/by-name/papis/default.nix b/plugins/by-name/papis/default.nix
index 0ef51b30..5a5cd5fb 100644
--- a/plugins/by-name/papis/default.nix
+++ b/plugins/by-name/papis/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "papis";
   packPathName = "papis.nvim";
@@ -7,15 +7,18 @@ lib.nixvim.plugins.mkNeovimPlugin {
   maintainers = [ lib.maintainers.GaetanLepage ];
 
   # papis.nvim is an nvim-cmp source too
-  imports = [ { cmpSourcePlugins.papis = "papis"; } ];
+  imports = [
+    { cmpSourcePlugins.papis = "papis"; }
 
-  extraOptions = {
-    yqPackage = lib.mkPackageOption pkgs "yq" {
-      nullable = true;
-    };
-  };
-  extraConfig = cfg: {
-    extraPackages = [ cfg.yqPackage ];
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "yq";
+      packageName = "yq";
+    })
+  ];
+
+  extraConfig = {
+    dependencies.yq.enable = lib.mkDefault true;
   };
 
   settingsOptions = import ./settings-options.nix lib;