From 13b45c45a1bf340b66c3d6a69e4ed9d45bfb999b Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Wed, 28 Oct 2026 17:11:58 +0100
Subject: [PATCH] feat(nvim): add 'biome' to 'conform.nvim'

---
 home/modules/nvim/config/after/plugin/conform.lua   | 13 +++++++++----
 home/modules/nvim/config/after/plugin/lspconfig.lua |  1 +
 home/modules/nvim/config/languages.nix              |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/home/modules/nvim/config/after/plugin/conform.lua b/home/modules/nvim/config/after/plugin/conform.lua
index b31ffb8..7e94ac7 100644
--- a/home/modules/nvim/config/after/plugin/conform.lua
+++ b/home/modules/nvim/config/after/plugin/conform.lua
@@ -23,10 +23,12 @@ local formatters = {
   shell = { bash = { "shellcheck" } },
   svelte = { svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true } },
   typescript = {
-    javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
-    javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
-    typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
-    typescriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
+    javascript = { "biome-check", "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
+    javascriptreact = { "biome-check", "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
+    json = { "biome-check", "prettierd", "prettier", stop_after_first = true },
+    jsonc = { "biome-check", "prettierd", "prettier", stop_after_first = true },
+    typescript = { "biome-check", "eslint_d", "prettierd", "prettier", stop_after_first = true },
+    typescriptreact = { "biome-check", "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
   },
   yaml = {
     -- yaml = { "prettierd", "prettier", stop_after_first = true },
@@ -47,5 +49,8 @@ require("conform").setup({
     lsp_format = "never",
     timeout_ms = 500,
   },
+  formatters = {
+    ["biome-check"] = { require_cwd = true },
+  },
   formatters_by_ft = formatters_by_ft,
 })
diff --git a/home/modules/nvim/config/after/plugin/lspconfig.lua b/home/modules/nvim/config/after/plugin/lspconfig.lua
index 0978e47..60ac1ae 100644
--- a/home/modules/nvim/config/after/plugin/lspconfig.lua
+++ b/home/modules/nvim/config/after/plugin/lspconfig.lua
@@ -101,6 +101,7 @@ local servers = {
   },
   tailwind = { tailwindcss = {} },
   typescript = {
+    biome = {},
     eslint = {
       settings = {
         --Assuming prettier/prettierd will handle formatting, we don't need to see these errors
diff --git a/home/modules/nvim/config/languages.nix b/home/modules/nvim/config/languages.nix
index ff2311c..55e80c3 100644
--- a/home/modules/nvim/config/languages.nix
+++ b/home/modules/nvim/config/languages.nix
@@ -118,6 +118,7 @@ with pkgs;
   typescript = {
     enable = false;
     packages = [
+      biome
       eslint_d
       (if (categories.typescriptServer or "ts_ls") == "vtsls" then vtsls else typescript-language-server)
       vscode-langservers-extracted