diff --git a/nvim/lua/kogakure/lsp/handlers.lua b/nvim/lua/kogakure/lsp/handlers.lua
index 30c1675..d67a4b7 100644
--- a/nvim/lua/kogakure/lsp/handlers.lua
+++ b/nvim/lua/kogakure/lsp/handlers.lua
@@ -83,6 +83,7 @@ end
 -- https://github.com/jose-elias-alvarez/null-ls.nvim/wiki/Formatting-on-save
 local lsp_formatting = function(bufnr)
 	vim.lsp.buf.format({
+		timeout_ms = 2000,
 		bufnr = bufnr,
 		filter = function(client)
 			return client.name == "null-ls"
diff --git a/nvim/lua/kogakure/lsp/null-ls.lua b/nvim/lua/kogakure/lsp/null-ls.lua
index 784f008..1774a8e 100644
--- a/nvim/lua/kogakure/lsp/null-ls.lua
+++ b/nvim/lua/kogakure/lsp/null-ls.lua
@@ -21,24 +21,21 @@ null_ls.setup({
 		code_actions.gitsigns,
 		code_actions.proselint,
 		completion.luasnip,
-		diagnostics.eslint, -- Eslint
-		-- diagnostics.eslint_d, -- Eslint
+		diagnostics.eslint_d,
 		diagnostics.flake8, -- Python
 		diagnostics.gitlint,
 		diagnostics.markdownlint.with({ extra_args = { "--rules ~MD033" } }),
 		diagnostics.stylelint,
 		diagnostics.tsc,
 		diagnostics.vale,
-		-- diagnostics.yamllint,
 		diagnostics.zsh,
 		formatting.autopep8, -- Python
 		formatting.black.with({ extra_args = { "--fast" } }), -- Python
 		formatting.eslint_d,
 		formatting.markdownlint,
 		formatting.prettierd,
-		-- formatting.prettier.with({ extra_args = { "--single-quote" } }),
 		formatting.stylelint,
-		formatting.stylua, -- Lua
+		formatting.stylua,
 		formatting.trim_newlines,
 		formatting.trim_whitespace,
 		formatting.rustfmt,