diff --git a/modules/dependencies.nix b/modules/dependencies.nix index 6d4538bd..5d267e92 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -46,6 +46,7 @@ let websocat.default = "websocat"; which.default = "which"; yazi.default = "yazi"; + zk.default = "zk"; }; mkDependencyOption = name: properties: { diff --git a/plugins/by-name/zk/default.nix b/plugins/by-name/zk/default.nix index b8dcb34c..ba42119b 100644 --- a/plugins/by-name/zk/default.nix +++ b/plugins/by-name/zk/default.nix @@ -2,7 +2,6 @@ lib, helpers, config, - pkgs, ... }: with lib; @@ -31,6 +30,13 @@ lib.nixvim.plugins.mkNeovimPlugin { "filetypes" ] ]; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "zk"; + packageName = "zk"; + }) + ]; settingsOptions = { picker = @@ -107,13 +113,8 @@ lib.nixvim.plugins.mkNeovimPlugin { }; - extraOptions = { - zkPackage = lib.mkPackageOption pkgs "zk" { - nullable = true; - }; - }; extraConfig = cfg: { - extraPackages = [ cfg.zkPackage ]; + dependencies.zk.enable = lib.mkDefault true; warnings = lib.nixvim.mkWarnings "plugins.zk" ( mapAttrsToList