From 81505dbd9295dcfa6a3aa51166250c2df50d8257 Mon Sep 17 00:00:00 2001 From: Jakub Kluwa Date: Wed, 8 Oct 2025 23:08:12 +0200 Subject: [PATCH] make file config --- init.lua | 4 +++- lua/custom/keymaps.lua | 11 ----------- lua/custom/plugins/init.lua | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/init.lua b/init.lua index 211b28ac..9c7cbb5b 100644 --- a/init.lua +++ b/init.lua @@ -100,7 +100,7 @@ vim.g.have_nerd_font = true vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' @@ -192,6 +192,8 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +vim.keymap.set('n', 'm', ':make', { noremap = true, silent = true, desc = 'Run make' }) + -- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes -- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) -- vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index 86e78d66..8b137891 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -1,12 +1 @@ -local dap = require 'dap' -local dapui = require 'dapui' -vim.keymap.set('n', '', dap.continue, { desc = 'Start/Continue debug' }) -vim.keymap.set('n', '', dap.step_over, { desc = 'Step over' }) -vim.keymap.set('n', '', dap.step_into, { desc = 'Step into' }) -vim.keymap.set('n', '', dap.step_out, { desc = 'Step out' }) -vim.keymap.set('n', 'b', dap.toggle_breakpoint, { desc = 'Toggle breakpoint' }) -vim.keymap.set('n', 'B', function() - dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') -end, { desc = 'Set conditional breakpoint' }) -vim.keymap.set('n', 'du', dapui.toggle, { desc = 'Toggle DAP UI' }) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 329ffc46..7872cf32 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -38,11 +38,22 @@ return { dap.configurations.cpp = { { - name = 'Launch file', + name = 'Launch C++ program (with make)', type = 'lldb', request = 'launch', program = function() - return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') + local result = vim.fn.system 'make' + + -- Print make output (optional) + print(result) + + if vim.v.shell_error ~= 0 then + error '❌ Build failed! Check your Makefile.' + else + print '✅ Build successful!' + end + + return vim.fn.getcwd() .. '/main' end, cwd = '${workspaceFolder}', stopOnEntry = false,