diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ca5ce5cc3aad..e206bcf8a930 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4769,6 +4769,8 @@ let
 
       tboby.cwtools-vscode = callPackage ./tboby.cwtools-vscode { };
 
+      tombi-toml.tombi = callPackage ./tombi-toml.tombi { };
+
       tomoki1207.pdf = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "pdf";
diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
new file mode 100644
index 000000000000..bdbf9b835c12
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
@@ -0,0 +1,47 @@
+{
+  stdenv,
+  lib,
+  vscode-utils,
+}:
+
+let
+  supported = {
+    x86_64-linux = {
+      hash = "sha256-YoB9gH84F9h6vdRbgCJGQhBmcXQ6jzrxvF2hA7gb3aI=";
+      arch = "linux-x64";
+    };
+    x86_64-darwin = {
+      hash = "sha256-IDJJuSLNt0SxV8LdDX0JC3P+VR6NUAfe5u8p9vI+ik8=";
+      arch = "darwin-x64";
+    };
+    aarch64-linux = {
+      hash = "sha256-gDufj8XYlowpKd2MQMZBsnZ2eT/pbngDlKeIFlkUKzU=";
+      arch = "linux-arm64";
+    };
+    aarch64-darwin = {
+      hash = "sha256-biWq6nsO4XGOMSUA9/yXMejC1wTDKsuQdPU26w0r4Lg=";
+      arch = "darwin-arm64";
+    };
+  };
+
+  base =
+    supported.${stdenv.hostPlatform.system}
+      or (throw "unsupported platform ${stdenv.hostPlatform.system}");
+
+in
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = base // {
+    name = "tombi";
+    publisher = "tombi-toml";
+    version = "0.7.7";
+  };
+  meta = {
+    description = "TOML Language Server";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=tombi-toml.tombi";
+    homepage = "https://tombi-toml.github.io/tombi/";
+    license = lib.licenses.mit;
+    platforms = builtins.attrNames supported;
+    maintainers = [ lib.maintainers.m0nsterrr ];
+  };
+}