diff --git a/init.lua b/init.lua
index bc5d874d..1fbe01e2 100644
--- a/init.lua
+++ b/init.lua
@@ -483,6 +483,7 @@ require('which-key').register({
 local servers = {
   tsserver = {},
   denols = {},
+  eslint = {},
   lua_ls = {
     Lua = {
       workspace = { checkThirdParty = false },
@@ -526,6 +527,18 @@ lspconfig.denols.setup({
   },
 })
 
+lspconfig.eslint.setup {
+  root_dir = lspconfig.util.root_pattern('.eslintrc', '.eslintrc.js', '.eslintrc.json'),
+  settings = {
+    format = { enable = true },
+  },
+  handlers = {
+    ['window/showMessageRequest'] = function(_, result)
+      return result.message:match('ENOENT') and vim.NIL or result
+    end,
+  },
+}
+
 lspconfig.tsserver.setup({
   root_dir = lspconfig.util.root_pattern("package.json"),
   on_attach = function(client, bufnr)
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 091804c2..fb2f3ba3 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -139,9 +139,9 @@ return {
       null_ls.setup({
         sources = {
           null_ls.builtins.diagnostics.codespell,
-          require("none-ls.diagnostics.eslint_d").with({
-            method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
-          }),
+          -- require("none-ls.diagnostics.eslint_d").with({
+          --   method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
+          -- }),
           null_ls.builtins.diagnostics.stylelint.with({
             filetypes = { "scss", "css" },
           }),