diff --git a/lazy-lock.json b/lazy-lock.json
index 625bc1c7..f7ecf4a2 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -22,6 +22,8 @@
   "neogit": { "branch": "master", "commit": "8fd90675caf8b847280ca56f464b66030adad876" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
+  "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
   "nvim-lspconfig": { "branch": "master", "commit": "faa403f95fd82cc24ebd0cee6af41b0de2dae00c" },
   "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
   "nvim-treesitter": { "branch": "main", "commit": "5cb05e1b0fa3c469958a2b26f36b3fe930af221c" },
diff --git a/lua/kickstart/plugins/conform.lua b/lua/kickstart/plugins/conform.lua
index 4c3e364c..1f8c5f9b 100644
--- a/lua/kickstart/plugins/conform.lua
+++ b/lua/kickstart/plugins/conform.lua
@@ -35,6 +35,9 @@ return {
         rust = { 'rustfmt' },
         go = { 'gofmt' },
         yaml = { 'yamlfmt' },
+        typescript = { 'biome' },
+        javascript = { 'biome' },
+        typescriptreact = { 'biome' },
       },
     },
   },
diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
index 552f29f2..1df78edb 100644
--- a/lua/kickstart/plugins/lint.lua
+++ b/lua/kickstart/plugins/lint.lua
@@ -8,6 +8,8 @@ return {
       lint.linters_by_ft = {
         go = { 'golangcilint' },
         markdown = { 'markdownlint' },
+        typescript = { 'biomejs' },
+        typescriptreact = { 'biomejs' },
       }
 
       -- To allow other plugins to add linters to require('lint').linters_by_ft,
diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua
index ffd6f4ae..f83f3e6d 100644
--- a/lua/kickstart/plugins/lspconfig.lua
+++ b/lua/kickstart/plugins/lspconfig.lua
@@ -244,6 +244,7 @@ return {
             },
           },
         },
+        biome = {},
       }
 
       -- Ensure the servers and tools above are installed
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index 21594196..ab6de70b 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -45,8 +45,8 @@ require('lazy').setup({
   --
   -- require 'kickstart.plugins.debug',
   -- require 'kickstart.plugins.indent_line',
-  -- require 'kickstart.plugins.lint',
-  -- require 'kickstart.plugins.autopairs',
+  require 'kickstart.plugins.lint',
+  require 'kickstart.plugins.autopairs',
   -- require 'kickstart.plugins.neo-tree',
 
   -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`