diff --git a/lazy-lock.json b/lazy-lock.json
index 1030228..dd2ebc7 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,6 +1,7 @@
 {
   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
   "commander.nvim": { "branch": "main", "commit": "84101e8eb1613a72bbdec655b734f891d8a00694" },
+  "conform.nvim": { "branch": "master", "commit": "a0ab60ed666c56b37fd7ed1847d2ac52f2482ce0" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
@@ -16,24 +17,24 @@
   "mini.statusline": { "branch": "main", "commit": "e331175f10d9f400b42523b3890841aba202ce16" },
   "namu.nvim": { "branch": "main", "commit": "6759df3cddb1d6d11442b953f8b63e64350229f3" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
-  "neogit": { "branch": "master", "commit": "aec66c46c132a019296e9e73a2ef6d753bf15563" },
+  "neogit": { "branch": "master", "commit": "f664d58c88abb258ecda5c347839a476f160eea8" },
   "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" },
-  "none-ls.nvim": { "branch": "main", "commit": "5fcb73913a9290f78097e34420fe0e6130c5c33c" },
+  "none-ls.nvim": { "branch": "main", "commit": "53ec77181d96494b9dc9457110dd62dc623cc78d" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5f1c9a90c8db9c647da40ce6cf5be9e49ccbf0c7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3d97ec4174bcc750d70718ddedabf150536a5891" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
   "nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4ae47f4fb18e85b80e84b729974fe65483b06aaf" },
   "output-panel.nvim": { "branch": "main", "commit": "9979f9988acb35fd8e699d8b1fbc7aa17c9d8148" },
   "overlook.nvim": { "branch": "master", "commit": "c1e6c2ee9ae08d44dca4fd2ac79cd8c341d2e5c9" },
   "package-info.nvim": { "branch": "master", "commit": "5cb3483ec886ca23e2c57e5d4a63c958d9a98179" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "render-markdown.nvim": { "branch": "main", "commit": "0087ee1d505d4fc4886d8d3121ae7848b7c0e49b" },
-  "schemastore.nvim": { "branch": "main", "commit": "e906ac3ed0bd273781759e7635b5b824393c925c" },
+  "render-markdown.nvim": { "branch": "main", "commit": "f626e90bbc4b3d8f4fd29c909d958b165af13f4a" },
+  "schemastore.nvim": { "branch": "main", "commit": "8e74c08998fd786239caba373344f4e4601e21fe" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "f64efd33a51ea89bdb847fb3aaf716e96b83ba1a" },
diff --git a/lua/plugins/conform.nvim.lua b/lua/plugins/conform.nvim.lua
new file mode 100644
index 0000000..9254bc6
--- /dev/null
+++ b/lua/plugins/conform.nvim.lua
@@ -0,0 +1,19 @@
+return {
+    'stevearc/conform.nvim',
+    opts = {
+        formatters_by_ft = {
+            javascript = { "prettierd", "prettier", stop_after_first = true },
+            kulala     = { "kulala-fmt" },
+            lua        = { lsp_format = "fallback" },
+            go         = { lsp_format = "fallback" },
+            rust       = { lsp_format = "fallback" },
+            toml       = { lsp_format = "fallback" },
+            yaml       = { lsp_format = "fallback" },
+            java       = { lsp_format = "fallback" }
+        },
+        format_on_save = {
+            timeout_ms = 500,
+            lsp_format = "fallback",
+        },
+    },
+}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index cf80c7a..6e9dbb2 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -24,26 +24,6 @@ local format_on_save = function(client, bufnr)
 end
 
 
-vim.api.nvim_create_autocmd('LspAttach', {
-    callback = function(args)
-        local client = vim.lsp.get_client_by_id(args.data.client_id)
-        if not client then return end
-
-        local LSP_CLIENT_NAMES_FORMAT_ON_SAVE = { "lua_ls", "jdtls", "gopls", "taplo", "yamlls" }
-        for _, client_name_autoformat in ipairs(LSP_CLIENT_NAMES_FORMAT_ON_SAVE) do
-            if client.name == client_name_autoformat and client.server_capabilities.documentFormattingProvider then
-                -- Format the current buffer on save
-                vim.api.nvim_create_autocmd('BufWritePre', {
-                    buffer = args.buf,
-                    callback = function()
-                        vim.lsp.buf.format({ bufnr = args.buf, id = client.id })
-                    end,
-                })
-            end
-        end
-    end,
-})
-
 vim.diagnostic.config({
     virtual_lines = false,
     virtual_text = false,
@@ -110,24 +90,11 @@ return {
         config = function()
             local null_ls = require("null-ls")
 
-            local kulala_fmt = {
-                method = null_ls.methods.FORMATTING,
-                filetypes = { "http" },
-                generator = null_ls.formatter({
-                    command = "kulala-fmt",
-                    args = { "format", "--stdin" },
-                    to_stdin = true,
-                }),
-            }
-
             null_ls.setup({
                 on_attach = function(client, bufnr)
                     format_on_save(client, bufnr)
                 end,
                 sources = {
-                    null_ls.builtins.formatting.prettierd,
-                    kulala_fmt,
-
                     null_ls.builtins.diagnostics.dotenv_linter,
                     null_ls.builtins.diagnostics.editorconfig_checker,
                     null_ls.builtins.diagnostics.proselint,