From 20302afeca7ed0553ca386626b0af2ffff0dd5f1 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Wed, 9 Oct 2024 17:52:32 +0200 Subject: [PATCH] dap: appease the nix gods (fix statix lint) --- modules/plugins/debugger/nvim-dap/config.nix | 104 ++++++++++--------- 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/modules/plugins/debugger/nvim-dap/config.nix b/modules/plugins/debugger/nvim-dap/config.nix index 1c80ac41..a6689591 100644 --- a/modules/plugins/debugger/nvim-dap/config.nix +++ b/modules/plugins/debugger/nvim-dap/config.nix @@ -16,66 +16,70 @@ in { config = mkMerge [ (mkIf cfg.enable { - vim.startPlugins = ["nvim-dap"]; + vim = { + startPlugins = ["nvim-dap"]; - vim.pluginRC = - { - # TODO customizable keymaps - nvim-dap = entryAnywhere '' - local dap = require("dap") - vim.fn.sign_define("DapBreakpoint", { text = "🛑", texthl = "ErrorMsg", linehl = "", numhl = "" }) - ''; - } - // mapAttrs (_: v: (entryAfter ["nvim-dap"] v)) cfg.sources; + pluginRC = + { + # TODO customizable keymaps + nvim-dap = entryAnywhere '' + local dap = require("dap") + vim.fn.sign_define("DapBreakpoint", { text = "🛑", texthl = "ErrorMsg", linehl = "", numhl = "" }) + ''; + } + // mapAttrs (_: v: (entryAfter ["nvim-dap"] v)) cfg.sources; - vim.maps.normal = mkMerge [ - (mkSetLuaBinding mappings.continue "require('dap').continue") - (mkSetLuaBinding mappings.restart "require('dap').restart") - (mkSetLuaBinding mappings.terminate "require('dap').terminate") - (mkSetLuaBinding mappings.runLast "require('dap').run_last") + maps.normal = mkMerge [ + (mkSetLuaBinding mappings.continue "require('dap').continue") + (mkSetLuaBinding mappings.restart "require('dap').restart") + (mkSetLuaBinding mappings.terminate "require('dap').terminate") + (mkSetLuaBinding mappings.runLast "require('dap').run_last") - (mkSetLuaBinding mappings.toggleRepl "require('dap').repl.toggle") - (mkSetLuaBinding mappings.hover "require('dap.ui.widgets').hover") - (mkSetLuaBinding mappings.toggleBreakpoint "require('dap').toggle_breakpoint") + (mkSetLuaBinding mappings.toggleRepl "require('dap').repl.toggle") + (mkSetLuaBinding mappings.hover "require('dap.ui.widgets').hover") + (mkSetLuaBinding mappings.toggleBreakpoint "require('dap').toggle_breakpoint") - (mkSetLuaBinding mappings.runToCursor "require('dap').run_to_cursor") - (mkSetLuaBinding mappings.stepInto "require('dap').step_into") - (mkSetLuaBinding mappings.stepOut "require('dap').step_out") - (mkSetLuaBinding mappings.stepOver "require('dap').step_over") - (mkSetLuaBinding mappings.stepBack "require('dap').step_back") + (mkSetLuaBinding mappings.runToCursor "require('dap').run_to_cursor") + (mkSetLuaBinding mappings.stepInto "require('dap').step_into") + (mkSetLuaBinding mappings.stepOut "require('dap').step_out") + (mkSetLuaBinding mappings.stepOver "require('dap').step_over") + (mkSetLuaBinding mappings.stepBack "require('dap').step_back") - (mkSetLuaBinding mappings.goUp "require('dap').up") - (mkSetLuaBinding mappings.goDown "require('dap').down") - ]; + (mkSetLuaBinding mappings.goUp "require('dap').up") + (mkSetLuaBinding mappings.goDown "require('dap').down") + ]; + }; }) (mkIf (cfg.enable && cfg.ui.enable) { - vim.startPlugins = ["nvim-nio"]; + vim = { + startPlugins = ["nvim-nio"]; - vim.lazy.plugins = [ - { - package = "nvim-dap-ui"; - setupModule = "dapui"; - setupOpts = {}; + lazy.plugins = [ + { + package = "nvim-dap-ui"; + setupModule = "dapui"; + setupOpts = {}; - keys = [ - (mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end") - ]; - } - ]; + keys = [ + (mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end") + ]; + } + ]; - vim.pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] ( - optionalString cfg.ui.autoStart '' - dap.listeners.after.event_initialized["dapui_config"] = function() - require("dapui").open() - end - dap.listeners.before.event_terminated["dapui_config"] = function() - require("dapui").close() - end - dap.listeners.before.event_exited["dapui_config"] = function() - require("dapui").close() - end - '' - ); + pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] ( + optionalString cfg.ui.autoStart '' + dap.listeners.after.event_initialized["dapui_config"] = function() + require("dapui").open() + end + dap.listeners.before.event_terminated["dapui_config"] = function() + require("dapui").close() + end + dap.listeners.before.event_exited["dapui_config"] = function() + require("dapui").close() + end + '' + ); + }; }) ]; }