diff --git a/lazy-lock.json b/lazy-lock.json
index 540ef71..c8777b8 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,15 +9,16 @@
   "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "e51b651ca26cba250ef3a1150c8d35045eee2a84" },
   "lazy.nvim": { "branch": "main", "commit": "60cf258a9ae7fffe04bb31141141a91845158dcc" },
+  "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
   "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.nvim": { "branch": "main", "commit": "3875a2d352fa13f9d0468c4ce26cad8a3c794507" },
-  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
diff --git a/lua/complete.lua b/lua/complete.lua
index 9571192..9607b8f 100644
--- a/lua/complete.lua
+++ b/lua/complete.lua
@@ -8,7 +8,7 @@ luasnip.config.setup {
   updateevents = "TextChanged,TextChangedI",
   enable_autosnippets = true,
 }
-luasnip.filetype_extend("jj", {"gitcommit"})
+luasnip.filetype_extend("jj", { "gitcommit" })
 
 local has_words_before = function()
   unpack = unpack or table.unpack
@@ -40,7 +40,7 @@ cmp.setup {
     ['<Tab>'] = cmp.mapping(function(fallback)
       if cmp.visible() then
         if #cmp.get_entries() == 1 then
-          cmp.confirm({select = true})
+          cmp.confirm({ select = true })
         else
           cmp.select_next_item()
         end
@@ -49,7 +49,7 @@ cmp.setup {
       elseif has_words_before() then
         cmp.complete()
         if #cmp.get_entries() == 1 then
-          cmp.confirm({select = true})
+          cmp.confirm({ select = true })
         end
       else
         fallback()
@@ -66,6 +66,9 @@ cmp.setup {
     end, { 'i', 's' }),
   },
   sources = {
+    { name = 'lazydev',
+      group_index = 0 },
+    { name = 'nvim_lsp' },
     { name = 'nvim_lsp' },
     { name = 'luasnip' },
     { name = 'path' },
diff --git a/lua/lazy-configure.lua b/lua/lazy-configure.lua
index 845bced..09aac1e 100644
--- a/lua/lazy-configure.lua
+++ b/lua/lazy-configure.lua
@@ -10,6 +10,21 @@ require('lazy').setup({
 
   -- NOTE: This is where your plugins related to LSP can be installed.
   --  The configuration is done below. Search for lspconfig to find it below.
+  {
+    -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+    -- used for completion, annotations and signatures of Neovim apis
+    'folke/lazydev.nvim',
+    ft = 'lua',
+    opts = {
+      library = {
+        -- Load luvit types when the `vim.uv` word is found
+        { path = 'luvit-meta/library', words = { 'vim%.uv' } },
+      },
+    },
+  },
+  {
+    'Bilal2453/luvit-meta', lazy = true
+  },
   {
     -- LSP Configuration & Plugins
     'neovim/nvim-lspconfig',
@@ -21,9 +36,6 @@ require('lazy').setup({
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
       { 'j-hui/fidget.nvim', opts = {} },
-
-      -- Additional lua configuration, makes nvim stuff amazing!
-      'folke/neodev.nvim',
     },
   },
   -- LSP-signature
@@ -179,7 +191,7 @@ require('lazy').setup({
   },
 
   -- "gc" to comment visual regions/lines
-  { 'numToStr/Comment.nvim',    opts = {} },
+  { 'numToStr/Comment.nvim', opts = {} },
 
   -- Fuzzy Finder (files, lsp, etc)
   {
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 8303ce2..f72ae96 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -140,9 +140,6 @@ local servers = {
   },
 }
 
--- Setup neovim lua configuration
-require('neodev').setup()
-
 -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)