diff --git a/nvim/.config/nvim/lua/plugins/completion.lua b/nvim/.config/nvim/lua/plugins/completion.lua
index c86b02d..c49e23d 100644
--- a/nvim/.config/nvim/lua/plugins/completion.lua
+++ b/nvim/.config/nvim/lua/plugins/completion.lua
@@ -13,7 +13,6 @@ return {
 			"hrsh7th/cmp-buffer",
 			"hrsh7th/cmp-calc",
 			"hrsh7th/cmp-cmdline",
-			"hrsh7th/cmp-nvim-lua",
 			"hrsh7th/cmp-nvim-lsp-signature-help",
 			"dmitmel/cmp-digraphs",
 			"jc-doyle/cmp-pandoc-references",
@@ -93,7 +92,6 @@ return {
 					end,
 				},
 				sources = {
-					{ name = "nvim_lua" },
 					{
 						name = "beancount",
 						option = {
diff --git a/nvim/.config/nvim/lua/plugins/languages.lua b/nvim/.config/nvim/lua/plugins/languages.lua
index 073ef4d..c24cc38 100644
--- a/nvim/.config/nvim/lua/plugins/languages.lua
+++ b/nvim/.config/nvim/lua/plugins/languages.lua
@@ -1,5 +1,28 @@
 return {
 	{ "edKotinsky/Arduino.nvim", ft = "arduino", config = true }, -- statusline
-	{ "euclidianAce/BetterLua.vim", ft = "lua" }, -- better syntax highlighting for lua
 	{ "aliou/bats.vim", ft = { "bash", "sh", "zsh", "bats" } }, -- enable syntax for bats shell-code testing library
+	{
+		"folke/lazydev.nvim",
+		ft = "lua",
+		opts = {
+			library = {
+				-- Load luvit types when the `vim.uv` word is found
+				{ path = "luvit-meta/library", words = { "vim%.uv" } },
+			},
+		},
+		dependencies = {
+			{ "Bilal2453/luvit-meta" }, -- optional `vim.uv` typings
+			{ -- optional completion source for require statements and module annotations
+				"hrsh7th/nvim-cmp",
+				opts = function(_, opts)
+					opts.sources = opts.sources or {}
+					table.insert(opts.sources, {
+						name = "lazydev",
+						group_index = 0, -- set group index to 0 to skip loading LuaLS completions
+					})
+				end,
+				optional = true,
+			},
+		},
+	},
 }