diff --git a/lazy-lock.json b/lazy-lock.json index 98dbd96..6063aba 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,7 @@ { "Aquavium.nvim": { "branch": "main", "commit": "d007badfa5920cb50e136d30a3edf4342093d6b5" }, - "alpha-nvim": { "branch": "main", "commit": "6c6a89d5b068b5251c8bdf0dd57bb921bcfeeb09" }, + "alpha-nvim": { "branch": "main", "commit": "4ba26e41990c11620c96c0e1cff20eab65efde4a" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blamer.nvim": { "branch": "master", "commit": "e0d43c11697300eb68f00d69df8b87deb0bf52dc" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "bluloco.nvim": { "branch": "main", "commit": "294aa5ac5e639f36ab5db9729ac7583c37d896dc" }, "codecompanion.nvim": { "branch": "main", "commit": "b1cbe52ecd71e7b0ed43ac1dc6eb3aab4099db00" }, diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 0c1151d..00c1a5b 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -5,6 +5,9 @@ vim.keymap.set({"n", "v"}, "", "18j", {desc = "Fast scroll down"}) vim.keymap.set({"n", "v"}, "", "18k", {desc = "Fast scroll up"}) vim.keymap.set("n", "h", ":noh", {desc = "Remove current highlighting"}) +-- Exit terminal mode easily with Escape +vim.keymap.set('t', '', [[]], { desc = 'Exit terminal mode' }) + vim.keymap.set("v", "y", '"+y', {desc='Yank to "+ register for external copy/paste'}) --CODE/LSP @@ -55,4 +58,10 @@ if status_ok then vim.keymap.set("n", "cdh", function() require("dap.ui.widgets").hover() end, { desc = "DAP: Hover Variable Value" }) + vim.keymap.set("n", "cdu", function() + require("dapui").toggle() + end, { desc = "Debug: Toggle UI" }) + vim.keymap.set("n", "cdw", function() + require("dapui").elements.watches.add(vim.fn.expand("")) + end, { desc = "DAP Add Watch under cursor" }) end diff --git a/lua/ignoreConfig/colourConfig.lua.example b/lua/ignoreConfig/colourConfig.lua.example index eaf3163..4adef56 100644 --- a/lua/ignoreConfig/colourConfig.lua.example +++ b/lua/ignoreConfig/colourConfig.lua.example @@ -1,6 +1,25 @@ local opts = { - name = "everforest", - transparent = 0 + name = "everforest", + opts = { + everforest, + kanagawa, + marterial, + } +} + +local everforest = { + name = "everforest", + transparent = 0,--0, 1 or 2, least to most transparent +} + +local kanagawa = { + transparent = true, +} + +local marterial = { + disable = { + background = true, + } } return opts diff --git a/lua/plugins/debugger.lua b/lua/plugins/debugger.lua index 9d5977b..2c404ca 100644 --- a/lua/plugins/debugger.lua +++ b/lua/plugins/debugger.lua @@ -131,9 +131,18 @@ return { }) -- Automatically open/close DAP UI panels - dap.listeners.after.event_initialized["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 + -- Defer the open so nvim-dap-ui's async (nio) element buffers are ready. + -- Opening synchronously from inside the DAP event listener races buffer + -- creation and throws "layout.lua: Invalid buffer id: -1". + dap.listeners.after.event_initialized["dapui_config"] = function() + vim.schedule(function() dapui.open() end) + end + dap.listeners.before.event_terminated["dapui_config"] = function() + vim.schedule(function() dapui.close() end) + end + dap.listeners.before.event_exited["dapui_config"] = function() + vim.schedule(function() dapui.close() end) + end -- Step 2 & 3 configurations will go here... -- 1. Detect operating system @@ -169,9 +178,12 @@ return { id = "cppdbg", type = "executable", command = cpptools_path, - -- For Windows subprocess tracking stability + -- Must stay detached (the default) so the adapter + gdb + debuggee + -- run in their own process group. With detached=false on Windows + -- they share Neovim's console group, so terminating the session + -- (dap.terminate) sends the Ctrl-C/terminate signal to Neovim too. options = { - detached = not is_windows, + detached = true, }, } diff --git a/lua/pluginsLate/alpha.lua b/lua/pluginsLate/alpha.lua index f93432d..f23a1e7 100644 --- a/lua/pluginsLate/alpha.lua +++ b/lua/pluginsLate/alpha.lua @@ -38,9 +38,6 @@ return { dashboard.button("l", " Lazy settings", ":Lazy"), dashboard.button("q", "󰅚 quit nvim", ":qa"), } - local handle = io.popen('fortune') - local fortune = handle:read("*a") - handle:close() dashboard.section.footer.val = { [["we define the boundaries of reality;]], [[they don't define us."]],