diff --git a/neovim/lazylock-0.10.json b/neovim/lazylock-0.10.json
index 024b13a..1af2893 100644
--- a/neovim/lazylock-0.10.json
+++ b/neovim/lazylock-0.10.json
@@ -67,6 +67,10 @@
     "branch": "main",
     "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2"
   },
+  "lazydev.nvim": {
+    "branch": "main",
+    "commit": "d5800897d9180cea800023f2429bce0a94ed6064"
+  },
   "limelight.vim": {
     "branch": "master",
     "commit": "0c8cc7f503a775c505dc9c67f1f5041ab4d5f1fd"
diff --git a/neovim/lua/lazy_plugins.lua b/neovim/lua/lazy_plugins.lua
index e9b63e8..786f1c5 100644
--- a/neovim/lua/lazy_plugins.lua
+++ b/neovim/lua/lazy_plugins.lua
@@ -337,6 +337,15 @@ return {
         "https://github.com/folke/neodev.nvim",
         dependencies = { { "https://github.com/neovim/nvim-lspconfig" } },
         ft = { "lua" },
+        -- Disable for nvim 0.10 because there is lazydev
+        enabled = vim.fn.has("nvim-0.10") ~= 1,
+    },
+    {
+        "https://github.com/folke/lazydev.nvim",
+        dependencies = { { "https://github.com/neovim/nvim-lspconfig" } },
+        ft = "lua",
+        opts = {},
+        enabled = vim.fn.has("nvim-0.10") == 1,
     },
 
     -- Rust analyzer
diff --git a/neovim/lua/plugins/completion.lua b/neovim/lua/plugins/completion.lua
index e986597..8cfa834 100644
--- a/neovim/lua/plugins/completion.lua
+++ b/neovim/lua/plugins/completion.lua
@@ -18,8 +18,10 @@ function M.config_cmp()
             { name = "luasnip" },
             { name = "buffer" },
             { name = "spell" },
+            -- TODO: Refactor to use the lazy opt expansion feature
             { name = "obsidian" },
             { name = "obsidian_new" },
+            { name = "lazydev" },
         },
         mapping = cmp.mapping.preset.insert({
             -- Scroll docs with readline back - forward