From a51dc2026b8c4acb4d9eb2296affbe3ee86ef0e8 Mon Sep 17 00:00:00 2001
From: Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
Date: Sun, 1 Feb 2026 12:45:24 +0500
Subject: [PATCH] fixed dapui for xdebug

---
 lua/keymaps/plugins.lua                 | 26 ---------------
 lua/plugins/dap-ui.lua                  | 43 +++++++++++++++++++++++++
 lua/plugins/{ => disabled}/diaglist.lua |  2 +-
 lua/plugins/lazydev.lua                 |  2 ++
 4 files changed, 46 insertions(+), 27 deletions(-)
 rename lua/plugins/{ => disabled}/diaglist.lua (62%)

diff --git a/lua/keymaps/plugins.lua b/lua/keymaps/plugins.lua
index bd25a11..4d6df72 100644
--- a/lua/keymaps/plugins.lua
+++ b/lua/keymaps/plugins.lua
@@ -56,29 +56,3 @@ vim.keymap.set({ 'n', 'v', 't' }, 'F', function()
 -- 	vim.keymap.set('o', 'ih', '<cmd><c-U>Gitsigns select_hunk<cr>', { buffer = bufnr })
 -- 	vim.keymap.set('x', 'ih', '<cmd><c-U>Gitsigns select_hunk<cr>', { buffer = bufnr })
 -- end
-
---[[ mfussenegger/nvim-dap ]]
-vim.keymap.set('n', '<F5>', function() require('dap').continue() end)
-vim.keymap.set('n', '<F10>', function() require('dap').step_over() end)
-vim.keymap.set('n', '<F11>', function() require('dap').step_into() end)
-vim.keymap.set('n', '<F12>', function() require('dap').step_out() end)
-vim.keymap.set('n', '<Leader>b', function() require('dap').toggle_breakpoint() end)
-vim.keymap.set('n', '<Leader>B', function() require('dap').set_breakpoint() end)
-vim.keymap.set('n', '<Leader>lp',
-	function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) 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)
-vim.keymap.set({ 'n', 'v' }, '<Leader>dh', function()
-	require('dap.ui.widgets').hover()
-end)
-vim.keymap.set({ 'n', 'v' }, '<Leader>dp', function()
-	require('dap.ui.widgets').preview()
-end)
-vim.keymap.set('n', '<Leader>df', function()
-	local widgets = require('dap.ui.widgets')
-	widgets.centered_float(widgets.frames)
-end)
-vim.keymap.set('n', '<Leader>ds', function()
-	local widgets = require('dap.ui.widgets')
-	widgets.centered_float(widgets.scopes)
-end)
diff --git a/lua/plugins/dap-ui.lua b/lua/plugins/dap-ui.lua
index 8fc775a..5b3647a 100644
--- a/lua/plugins/dap-ui.lua
+++ b/lua/plugins/dap-ui.lua
@@ -3,6 +3,48 @@ return {
 	'rcarriga/nvim-dap-ui',
 	enabled = true,
 	lazy = true,
+	keys = {
+		{ '<f5>',      function() require('dap').continue() end,          mode = { 'n' }, desc = 'DAP continue',          noremap = true, silent = true },
+		{ '<f10>',     function() require('dap').step_over() end,         mode = { 'n' }, desc = 'DAP step over',         noremap = true, silent = true },
+		{ '<f11>',     function() require('dap').step_into() end,         mode = { 'n' }, desc = 'DAP step into',         noremap = true, silent = true },
+		{ '<f12>',     function() require('dap').step_out() end,          mode = { 'n' }, desc = 'DAP step out',          noremap = true, silent = true },
+		{ '<leader>b', function() require('dap').toggle_breakpoint() end, mode = { 'n' }, desc = 'DAP toggle breakpoint', noremap = true, silent = true },
+		-- { '<leader>B', function() require('dap').set_breakpoint() end, mode = { 'n' }, desc = 'DAP set breakpoint', noremap = true, silent = true },
+		{
+			'<leader>lp',
+			function()
+				require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: '))
+			end,
+			mode = { 'n' },
+			desc = 'DAP log point message',
+			noremap = true,
+			silent = true
+		},
+		{ '<leader>dr', function() require('dap').repl.open() end,          mode = { 'n' },      desc = 'DAP repl open',       noremap = true, silent = true },
+		{ '<leader>dl', function() require('dap').run_last() end,           mode = { 'n' },      desc = 'DAP run last',        noremap = true, silent = true },
+		{ '<leader>dh', function() require('dap.ui.widgets').hover() end,   mode = { 'n', 'v' }, desc = 'DAP widgets hover',   noremap = true, silent = true },
+		{ '<leader>dp', function() require('dap.ui.widgets').preview() end, mode = { 'n', 'v' }, desc = 'DAP widgets preview', noremap = true, silent = true },
+		{
+			'<leader>df',
+			function()
+				local widgets = require('dap.ui.widgets'); widgets.centered_float(widgets.frames)
+			end,
+			mode = { 'n', 'v' },
+			desc = 'DAP centered float (frames)',
+			noremap = true,
+			silent = true
+		},
+		{
+			'<leader>ds',
+			function()
+				local widgets = require('dap.ui.widgets'); widgets.centered_float(widgets.scopesframes)
+			end,
+			mode = { 'n', 'v' },
+			desc = 'DAP centered float (scopes)',
+			noremap = true,
+			silent = true
+		},
+	},
 	dependencies = {
 		-- Debug Adapter Protocol client implementation for Neovim
 		{ 'mfussenegger/nvim-dap' },
@@ -12,6 +54,7 @@ return {
 	},
 	config = function()
 		local dap, dapui = require('dap'), require('dapui')
+		dapui.setup()
 
 		dap.listeners.before.attach.dapui_config = function()
 			dapui.open()
diff --git a/lua/plugins/diaglist.lua b/lua/plugins/disabled/diaglist.lua
similarity index 62%
rename from lua/plugins/diaglist.lua
rename to lua/plugins/disabled/diaglist.lua
index 0ba0ef0..a90fc06 100644
--- a/lua/plugins/diaglist.lua
+++ b/lua/plugins/disabled/diaglist.lua
@@ -6,7 +6,7 @@ return {
 	enabled = false,
 	lazy = true,
 	keys = {
-		{ '<leader><f3>', '<cmd>lua require(\'diaglist\').open_all_diagnostics()<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Open all diagnostics (diaglist)', noremap = true, silent = true },
+		{ '<f3>', '<cmd>lua require(\'diaglist\').open_all_diagnostics()<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Open all diagnostics (diaglist)', noremap = true, silent = true },
 	},
 	opts = {
 		debug = false,
diff --git a/lua/plugins/lazydev.lua b/lua/plugins/lazydev.lua
index af6bfd3..ba38090 100644
--- a/lua/plugins/lazydev.lua
+++ b/lua/plugins/lazydev.lua
@@ -8,6 +8,8 @@ return {
 		library = {
 			-- Load luvit types when the `vim.uv` word is found
 			{ path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+
+			library = { "nvim-dap-ui" }
 		},
 	}
 }