diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix
index d66928c..a856010 100644
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@@ -12,7 +12,7 @@
       nix-ld = enabled // {
         overkill = enabled;
       };
-      languages = "misc|nim|node|nushell|python|tex" |> listify;
+      languages = "misc|nim|node|nushell|python|tex|typst" |> listify;
     }
     // (
       ''
diff --git a/hosts/othalan/pkgs.nix b/hosts/othalan/pkgs.nix
index 42c7351..34da100 100644
--- a/hosts/othalan/pkgs.nix
+++ b/hosts/othalan/pkgs.nix
@@ -18,7 +18,6 @@
       charm-freeze
 
       quarto
-      typst
 
       calibre
     ]);
diff --git a/modules/languages/typst.nix b/modules/languages/typst.nix
new file mode 100644
index 0000000..82186d2
--- /dev/null
+++ b/modules/languages/typst.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIfIn;
+  cfg = config.oizys.languages;
+in
+{
+  config = mkIfIn "typst" cfg {
+    environment.systemPackages = with pkgs; [
+      typst
+      tinymist
+    ];
+  };
+}