diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 7ce8e00..3dcb4ee 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -17,6 +17,9 @@
   "neotest-python": { "branch": "master", "commit": "e53920d145d37783c8d8428365a0a230e0a18cb5" },
   "nvim-autopairs": { "branch": "master", "commit": "f00eb3b766c370cb34fdabc29c760338ba9e4c6c" },
   "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },
+  "nvim-dap": { "branch": "master", "commit": "c64a6627bb01eb151da96b28091797beaac09536" },
+  "nvim-dap-go": { "branch": "main", "commit": "6f045a72a05a78e4071dd0880f08214a2bb1461b" },
+  "nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" },
   "nvim-lint": { "branch": "master", "commit": "edd7bab99613849c8cccddcebece47aabb9e86b8" },
   "nvim-lspconfig": { "branch": "master", "commit": "d228bcf7cd94611929482a09e114a42c41fe81a8" },
   "nvim-tree.lua": { "branch": "master", "commit": "e8a89db1bbc06510a76fc935754b4e99a3e5e8a7" },
@@ -29,6 +32,7 @@
   "telescope.nvim": { "branch": "master", "commit": "2f32775405f6706348b71d0bb8a15a22852a61e4" },
   "term-edit.nvim": { "branch": "master", "commit": "28a095d6c9691039a5680b644676bbc80c6bcc35" },
   "toggleterm.nvim": { "branch": "main", "commit": "a54e6c471ce1cd8ef8357e34598a28a955297131" },
+  "trouble.nvim": { "branch": "main", "commit": "b2a0afac2c319a481f0f0318963a74d672ba5766" },
   "vim-fugitive": { "branch": "master", "commit": "2febbe1f00be04f16daa6464cb39214a8566ec4b" },
   "vim-monokai": { "branch": "master", "commit": "6b6c2b698e94d0af8d8f2307be01571ab8b7b74f" },
   "vim-vsnip": { "branch": "master", "commit": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e" },
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index bf268cb..de84541 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -4,7 +4,6 @@ vim.g.mapleader = " "
 -- visual block indenting
 vim.keymap.set("v", "<", "<gv")
 vim.keymap.set("v", ">", ">gv")
-
 -- centered cursor
 vim.keymap.set("n", "n", "nzz")
 vim.keymap.set("n", "N", "Nzz")
@@ -60,6 +59,7 @@ vim.keymap.set("n", "<leader>gq", "<cmd>Telescope diagnostics<CR>")
 vim.keymap.set("n", "<leader>gs", "<cmd>LspRestart<CR>")
 vim.keymap.set("n", "<leader>gf", "<cmd>Format<CR>")
 vim.keymap.set("n", "<leader>gF", "<cmd>FormatWrite<CR>")
+vim.keymap.set("n", "<leader>ge", "<cmd>TroubleToggle<CR>")
 vim.keymap.set("n", "<leader>ga", function()
 	vim.lsp.buf.code_action()
 end)
@@ -75,9 +75,6 @@ end)
 vim.keymap.set("n", "<leader>gn", function()
 	vim.lsp.buf.rename()
 end)
-vim.keymap.set("n", "<leader>ge", function()
-	vim.lsp.diagnostic.get_line_diagnostics()
-end)
 vim.keymap.set("n", "[d", function()
 	vim.diagnostic.goto_prev()
 end)
@@ -137,3 +134,26 @@ end)
 vim.keymap.set("n", "<leader>rn", function()
 	require("neogen").generate()
 end)
+
+-- dap
+vim.keymap.set("n", "<leader>dc", function()
+	require("dap").continue()
+end)
+vim.keymap.set("n", "<leader>dn", function()
+	require("dap").step_over()
+end)
+vim.keymap.set("n", "<leader>di", function()
+	require("dap").step_into()
+end)
+vim.keymap.set("n", "<leader>do", function()
+	require("dap").step_out()
+end)
+vim.keymap.set("n", "<leader>db", function()
+	require("dap").toggle_breakpoint()
+end)
+vim.keymap.set("n", "<leader>dr", function()
+	require("dap").repl.open()
+end)
+vim.keymap.set("n", "<leader>dl", function()
+	require("dap").run_last()
+end)
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 0dd0d85..476fe54 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -89,6 +89,27 @@ require("lazy").setup({
 		end,
 	},
 
+	-- dap
+	{
+		"mfussenegger/nvim-dap",
+		config = function()
+			require("plugins.dap")
+		end,
+		dependencies = {
+			"leoluz/nvim-dap-go",
+			"mfussenegger/nvim-dap-python",
+		},
+	},
+
+	-- trouble
+	{
+		"folke/trouble.nvim",
+		cmd = { "Trouble", "TroubleToggle" },
+		config = function()
+			require("plugins.trouble")
+		end,
+	},
+
 	-- toggleterm
 	{
 		"akinsho/toggleterm.nvim",
diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua
new file mode 100644
index 0000000..a159323
--- /dev/null
+++ b/.config/nvim/lua/plugins/dap.lua
@@ -0,0 +1,2 @@
+require("dap-go").setup()
+require("dap-python").setup()
diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
new file mode 100644
index 0000000..38ef1e9
--- /dev/null
+++ b/.config/nvim/lua/plugins/trouble.lua
@@ -0,0 +1 @@
+require("trouble").setup()