diff --git a/lua/plugins.lua b/lua/plugins.lua
index c248104..94d8057 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -62,8 +62,7 @@ vim.pack.add({
 	{ src = "https://github.com/coder/claudecode.nvim" },
 	{ src = "https://github.com/yetone/avante.nvim" },
 	{ src = "https://github.com/alaviss/nim.nvim" },
-	{ src = "https://github.com/yuukiflow/Arduino-Nvim" },
-	-- { src = "https://github.com/glebzat/arduino-nvim" },
+	{ src = "https://github.com/glebzlat/arduino-nvim" },
 })
 
 if host == "xps13" then
@@ -177,16 +176,8 @@ require('avante').setup({
 		}
 	}
 })
-require("Arduino-Nvim.lsp").setup({})
--- TODO: Fix keymap conflict with Claude
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = "arduino",
-	callback = function()
-		require("Arduino-Nvim")
-	end
-})
 
--- require('arduino-nvim').setup({
--- 	default_fqbn = "esp32:esp32:esp32",
--- 	filetypes = {"arduino"}
--- })
+require('arduino-nvim').setup({
+	default_fqbn = "esp32:esp32:esp32",
+	filetypes = {"arduino"}
+})