diff --git a/lua/plugins/format.lua b/lua/plugins/format.lua
index d1de7ad..eaf1980 100644
--- a/lua/plugins/format.lua
+++ b/lua/plugins/format.lua
@@ -17,11 +17,21 @@ return {
     format_on_save = {
       timeout_ms = 500,
       lsp_format = 'fallback',
+      async = true,
+    },
+    formatters = {
+      eslint_d = {
+        cwd = function() return vim.fn.getcwd() end,
+      },
     },
     formatters_by_ft = {
       lua = { 'stylua' },
       css = { 'stylelint' },
       json = { 'eslint_d' },
+      javascript = { 'eslint_d' },
+      javascriptreact = { 'eslint_d' },
+      typescript = { 'eslint_d' },
+      typescriptreact = { 'eslint_d' },
       ['*'] = { 'codespell', 'trim_whitespace' },
     },
   },
diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua
index 5c15e45..b1a07ad 100644
--- a/lua/plugins/lint.lua
+++ b/lua/plugins/lint.lua
@@ -5,6 +5,10 @@ return {
     local lint = require 'lint'
     lint.linters_by_ft = {
       make = { 'checkmake' },
+      javascript = { 'eslint' },
+      javascriptreact = { 'eslint' },
+      typescript = { 'eslint' },
+      typescriptreact = { 'eslint' },
     }
 
     -- Create autocommand which carries out the actual linting
@@ -13,7 +17,7 @@ return {
     vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
       group = lint_augroup,
       callback = function()
-        if vim.bo.modifiable then lint.try_lint(nil, { ignore_errors = false, cwd = vim.fn.getcwd() }) end
+        if vim.bo.modifiable then lint.try_lint(nil, { ignore_errors = false }) end
       end,
     })
   end,
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index c25c3fb..448b911 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -254,7 +254,7 @@ return {
           },
         },
 
-        eslint = { enable = true },
+        rust_analyzer = { enable = true },
         bashls = { enable = true },
         cssls = { enable = true },
         html = { enable = true },