diff --git a/tools/nvim/lua/plugins/dap.lua b/tools/nvim/lua/plugins/dap.lua
index 049923b..ab7b47f 100644
--- a/tools/nvim/lua/plugins/dap.lua
+++ b/tools/nvim/lua/plugins/dap.lua
@@ -1,4 +1,15 @@
 -- Debugger setups
 return {
-  { import = "plugins.mod.dap-setup" },
+  { "mfussenegger/nvim-dap" },
+  {
+    "rcarriga/nvim-dap-ui",
+    dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }
+  },
+  { "theHamsta/nvim-dap-virtual-text" },
+  {
+    "mfussenegger/nvim-dap-python",
+    config = function()
+      require("dap-python").setup("uv")
+    end
+  }
 }
diff --git a/tools/nvim/lua/plugins/init.lua b/tools/nvim/lua/plugins/init.lua
index 59fa3cb..1fe560c 100644
--- a/tools/nvim/lua/plugins/init.lua
+++ b/tools/nvim/lua/plugins/init.lua
@@ -8,6 +8,7 @@ require("lazy").setup({
     { import = "plugins.completion" },
     { import = "plugins.fileutils" },
     { import = "plugins.lsp" },
+    { import = "plugins.dap" },
     { import = "plugins.edit" },
     { import = "plugins.misc" },
   },
diff --git a/tools/nvim/lua/plugins/mod/dap-setup.lua b/tools/nvim/lua/plugins/mod/dap-setup.lua
index 99e1741..8b13789 100644
--- a/tools/nvim/lua/plugins/mod/dap-setup.lua
+++ b/tools/nvim/lua/plugins/mod/dap-setup.lua
@@ -1,3 +1 @@
-return {
-  "mfussenegger/nvim-dap",
-}
+