From b4b81587f3c964b811587911f963325d447a7c45 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 18:03:28 +0200
Subject: [PATCH] modules/dependencies: add distant

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

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index ce5d2369..660d3738 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -11,6 +11,7 @@ let
     ctags.default = "ctags";
     curl.default = "curl";
     direnv.default = "direnv";
+    distant.default = "distant";
     gcc.default = "gcc";
     gh.default = "gh";
     git = {
diff --git a/plugins/by-name/distant/default.nix b/plugins/by-name/distant/default.nix
index 4882c048..a5423d35 100644
--- a/plugins/by-name/distant/default.nix
+++ b/plugins/by-name/distant/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim)
@@ -17,14 +17,16 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   setup = ":setup";
 
-  extraOptions = {
-    distantPackage = lib.mkPackageOption pkgs "distant" {
-      nullable = true;
-    };
-  };
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "distant";
+      packageName = "distant";
+    })
+  ];
 
-  extraConfig = cfg: {
-    extraPackages = [ cfg.distantPackage ];
+  extraConfig = {
+    dependencies.distant.enable = lib.mkDefault true;
   };
 
   settingsOptions = {