diff --git a/config/dap-ui.nix b/config/dap-ui.nix
index 9f2da4a..c5100dd 100644
--- a/config/dap-ui.nix
+++ b/config/dap-ui.nix
@@ -9,12 +9,6 @@
         end
         dap.listeners.before.launch.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
         	'';
     };
diff --git a/config/default.nix b/config/default.nix
index 88e017d..b23d59b 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -21,31 +21,32 @@
   };
   globals = { mapleader = " "; };
   extraConfigLua = ''
-                            vim.keymap.set("n", "<leader>pb", ":Pick buffers<CR>", {desc = "Pick buffers"})
-                            vim.keymap.set("n", "<leader>pd", ":Pick diagnostic<CR>", {desc = "Pick diagnostic"})
-                            vim.keymap.set("n", "<leader>pe", ":Pick explorer<CR>", {desc = "Pick explorer"})
-                            vim.keymap.set("n", "<leader>pf", ":Pick files<CR>", {desc = "Pick files"})
-                            vim.keymap.set("n", "<leader>pg", ":Pick grep_live<CR>", {desc = "Pick grep live"})
-                            vim.keymap.set("n", "<leader>ph", ":Pick git_hunks<CR>", {desc = "Pick git hunks"})
-                            vim.keymap.set("n", "<leader>pl", ":Pick lsp<CR>", {desc = "Pick lsp"})
-                            vim.keymap.set("n", "<leader>pm", ":Pick marks<CR>", {desc = "Pick marks"})
-                	    vim.keymap.set({"n", "v"}, "<leader>de", function() require("dapui").eval() end, {desc = "Debug eval"})
-            	    vim.keymap.set("n", "<F5>", function() require("dap").continue() end, {desc = "Debug continue"})
-            	    vim.keymap.set("n", "<F10>", function() require("dap").step_over() end, {desc = "Debug step over"})
-            	    vim.keymap.set("n", "<F11>", function() require("dap").step_into() end, {desc = "Debug step into"})
-            	    vim.keymap.set("n", "<F12>", function() require("dap").step_out() end, {desc = "Debug step out"})
-            	    vim.keymap.set("n", "<leader>db", function() require("dap").toggle_breakpoint() end, {desc = "Debug toggle breakpoint"})
-            	    vim.keymap.set("n", "<leader>dB", function() require("dap").set_breakpoint() end, {desc = "Debug set breakpoint"})
-            	    vim.keymap.set("n", "<leader>dlp", function() require("dap").set_breakpoint(nil, nil, vim.fn.input('Log point message:')) end, {desc = "Debug set logpoint"})
-            	    vim.keymap.set("n", "<leader>dr", function() require("dap").repl.open() end, {desc = "Debug repl open"})
-            	    vim.keymap.set("n", "<leader>dp", function() require("dap").run_last() end, {desc = "Debug run last"})
-        	    vim.keymap.set("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", {desc = "Apply code action"})
-    	    vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>", {desc = "Toggle undo tree"})
+                                vim.keymap.set("n", "<leader>pb", ":Pick buffers<CR>", {desc = "Pick buffers"})
+                                vim.keymap.set("n", "<leader>pd", ":Pick diagnostic<CR>", {desc = "Pick diagnostic"})
+                                vim.keymap.set("n", "<leader>pe", ":Pick explorer<CR>", {desc = "Pick explorer"})
+                                vim.keymap.set("n", "<leader>pf", ":Pick files<CR>", {desc = "Pick files"})
+                                vim.keymap.set("n", "<leader>pg", ":Pick grep_live<CR>", {desc = "Pick grep live"})
+                                vim.keymap.set("n", "<leader>ph", ":Pick git_hunks<CR>", {desc = "Pick git hunks"})
+                                vim.keymap.set("n", "<leader>pl", ":Pick lsp<CR>", {desc = "Pick lsp"})
+                                vim.keymap.set("n", "<leader>pm", ":Pick marks<CR>", {desc = "Pick marks"})
+                    	    vim.keymap.set({"n", "v"}, "<leader>de", function() require("dapui").eval() end, {desc = "Debug eval"})
+                	    vim.keymap.set("n", "<F5>", function() require("dap").continue() end, {desc = "Debug continue"})
+                	    vim.keymap.set("n", "<F10>", function() require("dap").step_over() end, {desc = "Debug step over"})
+                	    vim.keymap.set("n", "<F11>", function() require("dap").step_into() end, {desc = "Debug step into"})
+                	    vim.keymap.set("n", "<F12>", function() require("dap").step_out() end, {desc = "Debug step out"})
+                	    vim.keymap.set("n", "<leader>db", function() require("dap").toggle_breakpoint() end, {desc = "Debug toggle breakpoint"})
+                	    vim.keymap.set("n", "<leader>dB", function() require("dap").set_breakpoint() end, {desc = "Debug set breakpoint"})
+                	    vim.keymap.set("n", "<leader>dl", function() require("dap").set_breakpoint(nil, nil, vim.fn.input('Log point message:')) end, {desc = "Debug set logpoint"})
+                	    vim.keymap.set("n", "<leader>dr", function() require("dap").repl.open() end, {desc = "Debug repl open"})
+                	    vim.keymap.set("n", "<leader>dp", function() require("dap").run_last() end, {desc = "Debug run last"})
+    	    vim.keymap.set("n", "<leader>dc", function () dapui.close() end, {desc = "Close Dap-UI"})
+            	    vim.keymap.set("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", {desc = "Apply code action"})
+        	    vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>", {desc = "Toggle undo tree"})
 
-                            local imap_expr = function(lhs, rhs)
-                        	vim.keymap.set('i', lhs, rhs, { expr = true })
-                              end
-                              imap_expr('<Tab>',   [[pumvisible() ? "\<C-n>" : "\<Tab>"]])
-                              imap_expr('<S-Tab>', [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]])
+                                local imap_expr = function(lhs, rhs)
+                            	vim.keymap.set('i', lhs, rhs, { expr = true })
+                                  end
+                                  imap_expr('<Tab>',   [[pumvisible() ? "\<C-n>" : "\<Tab>"]])
+                                  imap_expr('<S-Tab>', [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]])
   '';
 }