diff --git a/lazy-lock.json b/lazy-lock.json
index 4ae3fa0..311439e 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -15,12 +15,13 @@
   "gitsigns.nvim": { "branch": "main", "commit": "2c6f96dda47e55fa07052ce2e2141e8367cbaaf2" },
   "impatient.nvim": { "branch": "main", "commit": "b842e16ecc1a700f62adb9802f8355b99b52a5a6" },
   "indent-blankline.nvim": { "branch": "master", "commit": "db7cbcb40cc00fc5d6074d7569fb37197705e7f6" },
-  "lazy.nvim": { "branch": "main", "commit": "c05d61d208afaccb2a6765c0a6eb2d4e506a8c18" },
+  "lazy.nvim": { "branch": "main", "commit": "4f60facf18b34ae06d164485aa2ce879e21e44fc" },
   "live-server": { "branch": "main", "commit": "ecd7c1418823b65dd2bca710587c80afe42c973e" },
   "lualine.nvim": { "branch": "master", "commit": "a52f078026b27694d2290e34efa61a6e4a690621" },
   "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "610f5919fe633ac872239a0ab786572059f0d91d" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "93946aef86b1409958c97ee5feaf30bdd1053e24" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "a775db8ac7c468fb05fcf67069961dba0d7feb56" },
   "mason.nvim": { "branch": "main", "commit": "c2002d7a6b5a72ba02388548cfaf420b864fbc12" },
   "mini.ai": { "branch": "main", "commit": "14a1382372195573c6c7f494ab8bb298b03e6f04" },
   "mini.comment": { "branch": "main", "commit": "e5294cc3e75bafb2369f235d31a98b01a9cc67ad" },
@@ -32,6 +33,8 @@
   "nvim-autopairs": { "branch": "master", "commit": "4fc96c8f3df89b6d23e5092d31c866c53a346347" },
   "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193" },
+  "nvim-dap": { "branch": "master", "commit": "700a3c7d6fbe5b07bee74e9952b456120d355c47" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1e21b3b50e67700e32285b5a74e645311fd8bbea" },
   "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
   "nvim-lspconfig": { "branch": "master", "commit": "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda" },
   "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" },
@@ -39,7 +42,7 @@
   "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" },
   "nvim-tree.lua": { "branch": "master", "commit": "7282f7de8aedf861fe0162a559fc2b214383c51c" },
   "nvim-treesitter": { "branch": "master", "commit": "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "a3e65cdbe2fe16dc1ed76a3ffe11ce181a3f5cc5" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "2fb97bd6c53d78517d2022a0b84422c18ce5686e" },
   "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index b9cb7ae..4e8efcb 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -362,4 +362,25 @@ return {
 		ft = { "markdown" },
 		cmd = { "MarkdownPreview", "MarkdownPreviewStop", "MarkdownPreviewToggle" },
 	},
+	-- Start Debuger
+	{
+		"mfussenegger/nvim-dap",
+		enabled = vim.fn.has("win32") == 1,
+	},
+	{
+		"rcarriga/nvim-dap-ui",
+		enabled = vim.fn.has("win32") == 1,
+		dependencies = "mfussenegger/nvim-dap",
+		config = function()
+			require("user.dapui")
+		end,
+	},
+	{
+		"jayp0521/mason-nvim-dap.nvim",
+		enabled = vim.fn.has("win32") == 1,
+		dependencies = "mfussenegger/nvim-dap",
+		config = function()
+			require("user.mason-nvim-dap")
+		end,
+	},
 }
diff --git a/lua/user/dapui.lua b/lua/user/dapui.lua
new file mode 100644
index 0000000..c95e581
--- /dev/null
+++ b/lua/user/dapui.lua
@@ -0,0 +1,11 @@
+local dap, dapui = require("dap"), require("dapui")
+dap.listeners.after.event_initialized["dapui_config"] = function()
+	dapui.open()
+end
+dap.listeners.before.event_terminated["dapui_config"] = function()
+	dapui.close()
+end
+dap.listeners.before.event_exited["dapui_config"] = function()
+	dapui.close()
+end
+dapui.setup("plugins.dapui", { floating = { border = "rounded" } })
diff --git a/lua/user/mason-nvim-dap.lua b/lua/user/mason-nvim-dap.lua
new file mode 100644
index 0000000..0722fe9
--- /dev/null
+++ b/lua/user/mason-nvim-dap.lua
@@ -0,0 +1,3 @@
+local mason_nvim_dap = require("mason-nvim-dap")
+mason_nvim_dap.setup("plugins.mason-nvim-dap", { automatic_setup = true })
+mason_nvim_dap.setup_handlers("mason-nvim-dap.setup_handlers", {})
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 781bd27..537b845 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -226,6 +226,27 @@ local mappings = {
 			"Run MVN",
 		},
 	},
+	D = {
+		name = "Debug",
+		b = {
+			function()
+				require("dap").toggle_breakpoint()
+			end,
+			"Toggle Breakpoint",
+		},
+		B = {
+			function()
+				require("dap").clear_breakpoints()
+			end,
+			"Clear Breakpoints",
+		},
+		c = {
+			function()
+				require("dap").continue()
+			end,
+			"Start/Continue",
+		},
+	},
 }
 
 which_key.setup(setup)