From 090c4e0f7c3ebce173a8cfde1aaf48c4268332c6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Apr 2025 17:18:17 +0200 Subject: [PATCH] modules/dependencies: add texpresso --- modules/dependencies.nix | 1 + plugins/by-name/texpresso/default.nix | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/dependencies.nix b/modules/dependencies.nix index c1e97d9b..5cf1a48f 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -19,6 +19,7 @@ let default = "nodejs"; example = "pkgs.nodejs_22"; }; + texpresso.default = "texpresso"; tree-sitter.default = "tree-sitter"; typst.default = "typst"; ueberzug.default = "ueberzugpp"; diff --git a/plugins/by-name/texpresso/default.nix b/plugins/by-name/texpresso/default.nix index 1ee79154..f56580fe 100644 --- a/plugins/by-name/texpresso/default.nix +++ b/plugins/by-name/texpresso/default.nix @@ -1,7 +1,5 @@ { lib, - helpers, - pkgs, ... }: with lib; @@ -14,11 +12,15 @@ lib.nixvim.plugins.mkVimPlugin { maintainers = [ maintainers.nickhu ]; - extraOptions = { - texpressoPackage = lib.mkPackageOption pkgs "texpresso" { - nullable = true; - }; - }; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "texpresso"; + packageName = "texpresso"; + }) + ]; - extraConfig = cfg: { extraPackages = [ cfg.texpressoPackage ]; }; + extraConfig = { + dependencies.texpresso.enable = lib.mkDefault true; + }; }