diff --git a/nvim/lua/psoxizsh/lsp/preset.lua b/nvim/lua/psoxizsh/lsp/preset.lua
index ea32b89..69c1c26 100644
--- a/nvim/lua/psoxizsh/lsp/preset.lua
+++ b/nvim/lua/psoxizsh/lsp/preset.lua
@@ -63,17 +63,15 @@ M.Lua = {
   name  = 'sumneko_lua',
   ft    = 'lua',
   setup = function(server, settings, override)
-    -- Globally enable Neovim support
-    require('lua-dev').setup(override({
-      override = function(_, o)
-        o.enabled = true
-        o.runtime = true
-        o.types   = true
-        o.plugins = true
-      end
-    }))
+    require('neodev').setup({ lspconfig = false })
 
-    server.setup(settings)
+    local defaults = {
+      before_init = require('neodev.lsp').before_init
+    }
+
+    server.setup(override(
+      vim.tbl_deep_extend('keep', settings, defaults))
+    )
   end,
 }
 
diff --git a/nvim/lua/psoxizsh/plugins/plug.lua b/nvim/lua/psoxizsh/plugins/plug.lua
index 8ce0033..0638714 100644
--- a/nvim/lua/psoxizsh/plugins/plug.lua
+++ b/nvim/lua/psoxizsh/plugins/plug.lua
@@ -103,8 +103,8 @@ local plugins = {
       config = require 'psoxizsh.plugins.config.nlsp-settings'
   },
   { 'simrat39/rust-tools.nvim' },
-  { 'folke/lua-dev.nvim',
-      as = 'lua-dev',
+  { 'folke/neodev.nvim',
+      as = 'neodev',
   },
   { 'vim-perl/vim-perl',
       ft = 'perl',