diff --git a/lazy-lock.json b/lazy-lock.json
index 9759c5a..e4e9e38 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -17,6 +17,8 @@
   "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
   "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
   "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "c226aca7a506dd4325fb96188bffe804d24bbf18" },
+  "none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
   "none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" },
   "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
   "nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" },
diff --git a/lua/cosmic/plugins/null-ls/init.lua b/lua/cosmic/plugins/null-ls/init.lua
index 6a82e6e..310866b 100644
--- a/lua/cosmic/plugins/null-ls/init.lua
+++ b/lua/cosmic/plugins/null-ls/init.lua
@@ -3,6 +3,10 @@ local u = require('cosmic.utils')
 
 return {
   'nvimtools/none-ls.nvim',
+  dependencies = {
+    'nvimtools/none-ls-extras.nvim',
+    'gbprod/none-ls-shellcheck.nvim',
+  },
   config = function()
     local defaults = require('cosmic.lsp.providers.defaults')
     local null_ls = require('null-ls')
@@ -21,6 +25,9 @@ return {
       config_opts.sources = u.merge_list({
         null_ls.builtins.code_actions.gitsigns,
         null_ls.builtins.diagnostics.markdownlint,
+        require('none-ls.diagnostics.eslint_d'),
+        require('none-ls.formatting.eslint_d'),
+        require('none-ls.code_actions.eslint_d'),
         null_ls.builtins.formatting.prettierd.with({
           env = {
             PRETTIERD_LOCAL_PRETTIER_ONLY = 1,
@@ -33,6 +40,6 @@ return {
 
     null_ls.setup(u.merge(defaults, config_opts))
   end,
-  event = 'VeryLazy',
+  event = 'BufReadPre',
   enabled = not vim.tbl_contains(user_config.disable_builtin_plugins, 'null_ls'),
 }