diff --git a/lua/lsp.lua b/lua/lsp.lua
index bb65c4e..0cd0111 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -64,22 +64,22 @@ vim.api.nvim_create_autocmd("LspAttach", {
 require('which-key').add {
   -- { "<leader>c",  group = "[C]ode" },
   -- { "<leader>c_", hidden = true },
-  { "<leader>d",  group = "[D]ocument / [D]iagnostic/ [D]ebug" },
-  { "<leader>d_", hidden = true },
+  { "<leader>d",   group = "[D]ocument / [D]iagnostic/ [D]ebug" },
+  { "<leader>d_",  hidden = true },
   { "<leader>ds",  group = "[D]ebug [S]tep" },
   { "<leader>ds_", hidden = true },
-  { "<leader>g",  group = "[G]it" },
-  { "<leader>g_", hidden = true },
-  { "<leader>h",  group = "Git [H]unk" },
-  { "<leader>h_", hidden = true },
-  { "<leader>r",  group = "[R]ename" },
-  { "<leader>r_", hidden = true },
-  { "<leader>s",  group = "[S]earch" },
-  { "<leader>s_", hidden = true },
-  { "<leader>t",  group = "[T]oggle" },
-  { "<leader>t_", hidden = true },
-  { "<leader>w",  group = "[W]orkspace" },
-  { "<leader>w_", hidden = true },
+  { "<leader>g",   group = "[G]it" },
+  { "<leader>g_",  hidden = true },
+  { "<leader>h",   group = "Git [H]unk" },
+  { "<leader>h_",  hidden = true },
+  { "<leader>r",   group = "[R]ename" },
+  { "<leader>r_",  hidden = true },
+  { "<leader>s",   group = "[S]earch" },
+  { "<leader>s_",  hidden = true },
+  { "<leader>t",   group = "[T]oggle" },
+  { "<leader>t_",  hidden = true },
+  { "<leader>w",   group = "[W]orkspace" },
+  { "<leader>w_",  hidden = true },
 }
 -- register which-key VISUAL mode
 -- required for visual <leader>hs (hunk stage) to work
@@ -92,7 +92,45 @@ require('which-key').add {
 -- local capabilities = vim.lsp.protocol.make_client_capabilities()
 -- capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
--- [[ System LSPs ]]
+-- [[ DAP ]]
+
+local setup_dap = function()
+  local dap = require('dap');
+  local ui = require('dapui');
+  ui.setup();
+  require("nvim-dap-virtual-text").setup();
+
+  vim.keymap.set("n", "<Leader>b", dap.toggle_breakpoint, { desc = "Debug [B]reakpoint", silent = true });
+  vim.keymap.set("n", "<Leader>dr", dap.run_to_cursor, { desc = "[D]ebug [R]un to cursor" });
+  vim.keymap.set("n", "<Leader>de", function()
+    ui.eval(nil, { enter = true })
+  end, { desc = "[D]ebug [E]val under cursor", silent = true });
+
+  -- TODO: add some DAP configs to test
+
+  vim.keymap.set("n", "<Leader>dc", dap.continue, { desc = "[D]ebug [C]ontinue", silent = true })
+  vim.keymap.set("n", "<Leader>dsi", dap.step_into, { desc = "[D]ebug [S]tep [I]nto", silent = true })
+  vim.keymap.set("n", "<Leader>dso", dap.step_over, { desc = "[D]ebug [S]tep [O]ver", silent = true })
+  vim.keymap.set("n", "<Leader>dsu", dap.step_out, { desc = "[D]ebug [S]tep o[U]t", silent = true })
+  vim.keymap.set("n", "<Leader>dsb", dap.step_back, { desc = "[D]ebug [S]tep [B]ack", silent = true })
+  vim.keymap.set("n", "<Leader>dr", dap.restart, { desc = "[D]ebug [R]estart", silent = true })
+
+  dap.listeners.before.attach.dapui_config = function()
+    ui.open()
+  end
+  dap.listeners.before.launch.dapui_config = function()
+    ui.open()
+  end
+  dap.listeners.before.event_terminated.dapui_config = function()
+    ui.close()
+  end
+  dap.listeners.before.event_exited.dapui_config = function()
+    ui.close()
+  end
+end
+
+setup_dap()
+
 local setup_godot_dap = function()
   local dap = require("dap")
 
diff --git a/lua/plugins-configure.lua b/lua/plugins-configure.lua
index b854ae9..fd24228 100644
--- a/lua/plugins-configure.lua
+++ b/lua/plugins-configure.lua
@@ -42,40 +42,6 @@ require('lazy').setup({
       'rcarriga/nvim-dap-ui',
       'theHamsta/nvim-dap-virtual-text',
     },
-    config = function()
-      local dap = require('dap');
-      local ui = require('dapui');
-      ui.setup();
-      require("nvim-dap-virtual-text").setup();
-
-      vim.keymap.set("n", "<Leader>b", dap.toggle_breakpoint, { desc = "Debug [B]reakpoint", silent = true });
-      vim.keymap.set("n", "<Leader>dr", dap.run_to_cursor, { desc = "[D]ebug [R]un to cursor" });
-      vim.keymap.set("n", "<Leader>de", function()
-        ui.eval(nil, { enter = true })
-      end, { desc = "[D]ebug [E]val under cursor", silent = true });
-
-      -- TODO: add some DAP configs to test
-
-      vim.keymap.set("n", "<Leader>dc", dap.continue  , {desc="[D]ebug [C]ontinue", silent = true})
-      vim.keymap.set("n", "<Leader>dsi", dap.step_into , {desc="[D]ebug [S]tep [I]nto", silent = true})
-      vim.keymap.set("n", "<Leader>dso", dap.step_over , {desc="[D]ebug [S]tep [O]ver", silent = true})
-      vim.keymap.set("n", "<Leader>dsu", dap.step_out  , {desc="[D]ebug [S]tep o[U]t", silent = true})
-      vim.keymap.set("n", "<Leader>dsb", dap.step_back , {desc="[D]ebug [S]tep [B]ack", silent = true})
-      vim.keymap.set("n", "<Leader>dr", dap.restart  , {desc="[D]ebug [R]estart", silent = true})
-
-      dap.listeners.before.attach.dapui_config = function()
-        ui.open()
-      end
-      dap.listeners.before.launch.dapui_config = function()
-        ui.open()
-      end
-      dap.listeners.before.event_terminated.dapui_config = function()
-        ui.close()
-      end
-      dap.listeners.before.event_exited.dapui_config = function()
-        ui.close()
-      end
-    end,
   },
 
   {