diff --git a/lazy-lock.json b/lazy-lock.json
index 8dafb9d..ac13c09 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -12,10 +12,11 @@
   "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
   "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
   "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
+  "lazydev.nvim": { "branch": "main", "commit": "107231114623e2c4f90c626ec83b3120816b554e" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
-  "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
   "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" },
   "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" },
   "none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
diff --git a/lua/cosmic/plugins/lazydev/init.lua b/lua/cosmic/plugins/lazydev/init.lua
new file mode 100644
index 0000000..29911cb
--- /dev/null
+++ b/lua/cosmic/plugins/lazydev/init.lua
@@ -0,0 +1,18 @@
+local user_config = require('cosmic.core.user')
+return {
+  'folke/lazydev.nvim',
+  ft = 'lua', -- only load on lua files
+  opts = {
+    library = {
+      -- See the configuration section for more details
+      -- Load luvit types when the `vim.uv` word is found
+      { path = 'luvit-meta/library', words = { 'vim%.uv' } },
+      --[[ { path = 'plenary.nvim/lua/plenary', words = { 'plenary' } }, ]]
+      --[[ 'lazy.nvim', ]]
+      --[[ 'LazyVim', ]]
+    },
+  },
+  dependencies = { { 'Bilal2453/luvit-meta', lazy = true } },
+  enabled = not vim.tbl_contains(user_config.disable_builtin_plugins, 'lazydev'),
+  event = 'VeryLazy',
+}
diff --git a/lua/cosmic/plugins/neodev/init.lua b/lua/cosmic/plugins/neodev/init.lua
deleted file mode 100644
index e81423b..0000000
--- a/lua/cosmic/plugins/neodev/init.lua
+++ /dev/null
@@ -1 +0,0 @@
-return { 'folke/neodev.nvim', opt = {} }