diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 0a1e28bd..043d271f 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -19,6 +19,7 @@ let
       example = "pkgs.nodejs_22";
     };
     tree-sitter.default = "tree-sitter";
+    typst.default = "typst";
     ueberzug.default = "ueberzugpp";
     which.default = "which";
   };
diff --git a/plugins/by-name/typst-vim/default.nix b/plugins/by-name/typst-vim/default.nix
index 928949a4..16dddd6d 100644
--- a/plugins/by-name/typst-vim/default.nix
+++ b/plugins/by-name/typst-vim/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   helpers,
-  pkgs,
   ...
 }:
 with lib;
@@ -20,13 +19,15 @@ lib.nixvim.plugins.mkVimPlugin {
     "concealMath"
     "autoCloseToc"
   ];
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "typst-vim";
+      packageName = "typst";
+    })
+  ];
 
   extraOptions = {
-    # Add the typst compiler to nixvim packages
-    typstPackage = lib.mkPackageOption pkgs "typst" {
-      nullable = true;
-    };
-
     keymaps = {
       silent = mkOption {
         type = types.bool;
@@ -39,7 +40,7 @@ lib.nixvim.plugins.mkVimPlugin {
   };
 
   extraConfig = cfg: {
-    extraPackages = [ cfg.typstPackage ];
+    dependencies.typst.enable = lib.mkDefault true;
 
     keymaps =
       with cfg.keymaps;
diff --git a/tests/test-sources/plugins/by-name/typst-vim/default.nix b/tests/test-sources/plugins/by-name/typst-vim/default.nix
index 2e88f465..0d9d6ddb 100644
--- a/tests/test-sources/plugins/by-name/typst-vim/default.nix
+++ b/tests/test-sources/plugins/by-name/typst-vim/default.nix
@@ -22,9 +22,7 @@
   };
 
   no-packages = {
-    plugins.typst-vim = {
-      enable = true;
-      typstPackage = null;
-    };
+    plugins.typst-vim.enable = true;
+    dependencies.typst.enable = false;
   };
 }