|
85 | 85 | };
|
86 | 86 |
|
87 | 87 | plugins = {
|
| 88 | + dap-ui = { |
| 89 | + enable = true; |
| 90 | + |
| 91 | + lazyLoad.settings = { |
| 92 | + before.__raw = '' |
| 93 | + function() |
| 94 | + require('lz.n').trigger_load('nvim-dap') |
| 95 | + end |
| 96 | + ''; |
| 97 | + keys = [ |
| 98 | + { |
| 99 | + __unkeyed-1 = "<leader>du"; |
| 100 | + __unkeyed-2.__raw = '' |
| 101 | + function() |
| 102 | + require('dap.ext.vscode').load_launchjs(nil, {}) |
| 103 | + require("dapui").toggle() |
| 104 | + end |
| 105 | + ''; |
| 106 | + desc = "Toggle Debugger UI"; |
| 107 | + # options = { |
| 108 | + # silent = true; |
| 109 | + # }; |
| 110 | + } |
| 111 | + ]; |
| 112 | + }; |
| 113 | + }; |
| 114 | + dap-virtual-text = { |
| 115 | + enable = true; |
| 116 | + |
| 117 | + lazyLoad.settings = { |
| 118 | + before.__raw = '' |
| 119 | + function() |
| 120 | + require('lz.n').trigger_load('nvim-dap') |
| 121 | + end |
| 122 | + ''; |
| 123 | + cmd = [ |
| 124 | + "DapVirtualTextToggle" |
| 125 | + "DapVirtualTextEnable" |
| 126 | + ]; |
| 127 | + }; |
| 128 | + }; |
88 | 129 | dap = {
|
89 | 130 | enable = true;
|
90 |
| - # TODO: # TODO: upgrade to mkNeovimPlugin |
91 |
| - # lazyLoad.enable = true; |
| 131 | + |
| 132 | + lazyLoad.settings = { |
| 133 | + cmd = [ |
| 134 | + "DapContinue" |
| 135 | + "DapNew" |
| 136 | + ]; |
| 137 | + }; |
92 | 138 |
|
93 | 139 | adapters = {
|
94 | 140 | executables = {
|
|
252 | 298 | ];
|
253 | 299 | };
|
254 | 300 |
|
255 |
| - extensions = { |
256 |
| - dap-ui = { |
257 |
| - enable = true; |
258 |
| - }; |
| 301 | + # extensions = { |
| 302 | + # dap-ui = { |
| 303 | + # enable = true; |
| 304 | + # }; |
259 | 305 |
|
260 |
| - dap-virtual-text = { |
261 |
| - enable = true; |
262 |
| - }; |
263 |
| - }; |
| 306 | + # dap-virtual-text = { |
| 307 | + # enable = true; |
| 308 | + # }; |
| 309 | + # }; |
264 | 310 |
|
265 | 311 | signs = {
|
266 | 312 | dapBreakpoint = {
|
|
301 | 347 | {
|
302 | 348 | mode = "n";
|
303 | 349 | key = "<leader>db";
|
304 |
| - action.__raw = '' |
305 |
| - function() |
306 |
| - require("dap").toggle_breakpoint() |
307 |
| - end |
308 |
| - ''; |
| 350 | + action = "<CMD>DapToggleBreakpoint<CR>"; |
309 | 351 | options = {
|
310 | 352 | desc = "Breakpoint toggle";
|
311 | 353 | silent = true;
|
|
314 | 356 | {
|
315 | 357 | mode = "n";
|
316 | 358 | key = "<leader>dc";
|
317 |
| - action.__raw = '' |
318 |
| - function() |
319 |
| - require("dap").continue() |
320 |
| - end |
321 |
| - ''; |
| 359 | + action = "<CMD>DapContinue<CR>"; |
322 | 360 | options = {
|
323 | 361 | desc = "Continue Debugging (Start)";
|
324 | 362 | silent = true;
|
|
338 | 376 | {
|
339 | 377 | mode = "n";
|
340 | 378 | key = "<leader>do";
|
341 |
| - action.__raw = '' |
342 |
| - function() |
343 |
| - require("dap").step_out() |
344 |
| - end |
345 |
| - ''; |
| 379 | + action = "<CMD>DapStepOut<CR>"; |
346 | 380 | options = {
|
347 | 381 | desc = "Step Out";
|
348 | 382 | silent = true;
|
|
351 | 385 | {
|
352 | 386 | mode = "n";
|
353 | 387 | key = "<leader>ds";
|
354 |
| - action.__raw = '' |
355 |
| - function() |
356 |
| - require("dap").step_over() |
357 |
| - end |
358 |
| - ''; |
| 388 | + action = "<CMD>DapStepOver<CR>"; |
359 | 389 | options = {
|
360 | 390 | desc = "Step Over";
|
361 | 391 | silent = true;
|
|
364 | 394 | {
|
365 | 395 | mode = "n";
|
366 | 396 | key = "<leader>dS";
|
367 |
| - action.__raw = '' |
368 |
| - function() |
369 |
| - require("dap").step_into() |
370 |
| - end |
371 |
| - ''; |
| 397 | + action = "<CMD>DapStepInto<CR>"; |
372 | 398 | options = {
|
373 | 399 | desc = "Step Into";
|
374 | 400 | silent = true;
|
|
377 | 403 | {
|
378 | 404 | mode = "n";
|
379 | 405 | key = "<leader>dt";
|
380 |
| - action.__raw = '' |
381 |
| - function() require("dap").terminate() end |
382 |
| - ''; |
| 406 | + action = "<CMD>DapTerminate<CR>"; |
383 | 407 | options = {
|
384 | 408 | desc = "Terminate Debugging";
|
385 | 409 | silent = true;
|
386 | 410 | };
|
387 | 411 | }
|
388 | 412 | ]
|
389 |
| - ++ lib.optionals config.plugins.dap.extensions.dap-ui.enable [ |
| 413 | + ++ lib.optionals config.plugins.dap-ui.enable [ |
390 | 414 | {
|
391 | 415 | mode = "v";
|
392 | 416 | key = "<leader>de";
|
|
413 | 437 | silent = true;
|
414 | 438 | };
|
415 | 439 | }
|
416 |
| - { |
| 440 | + (lib.mkIf (!config.plugins.lz-n.enable) { |
417 | 441 | mode = "n";
|
418 | 442 | key = "<leader>du";
|
419 | 443 | action.__raw = ''
|
|
426 | 450 | desc = "Toggle Debugger UI";
|
427 | 451 | silent = true;
|
428 | 452 | };
|
429 |
| - } |
| 453 | + }) |
430 | 454 | ]
|
431 | 455 | ++
|
432 | 456 | lib.optionals
|
433 |
| - ((builtins.elem nvim-dap-view config.extraPlugins) && !config.plugins.dap.extensions.dap-ui.enable) |
| 457 | + ( |
| 458 | + (builtins.elem nvim-dap-view config.extraPlugins) |
| 459 | + && !config.plugins.dap.extensions.dap-ui.enable |
| 460 | + && !config.plugins.lz-n.enable |
| 461 | + ) |
434 | 462 | [
|
435 | 463 | {
|
436 | 464 | mode = "n";
|
|
0 commit comments