From 9f75201e84df1dee29c4e91d1c443f6cc9d85595 Mon Sep 17 00:00:00 2001
From: Martin Pander <martin.pander@knowtion.de>
Date: Tue, 24 Jun 2025 07:40:43 +0200
Subject: [PATCH] Merge dap config from main

---
 nix/user/nvim.nix |  1 +
 nvim/base.lua     |  3 +--
 nvim/keymaps.lua  | 20 ++++++++++++++++++++
 nvim/plugins.lua  |  5 +++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/nix/user/nvim.nix b/nix/user/nvim.nix
index 0ad8696..7cab6ee 100644
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -62,6 +62,7 @@
       nvim-dap
       nvim-nio
       nvim-dap-ui
+      nvim-dap-virtual-text
       nvim-dap-go
       nvim-dap-python
       (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
diff --git a/nvim/base.lua b/nvim/base.lua
index 255b4c5..c83664b 100644
--- a/nvim/base.lua
+++ b/nvim/base.lua
@@ -37,7 +37,7 @@ vim.opt.lazyredraw = true
 vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
 vim.opt.fillchars = 'vert:|,fold: '
 vim.opt.list = true
-vim.opt.laststatus = 2
+vim.opt.laststatus = 3
 vim.opt.scrolloff = 8
 vim.opt.background = 'light'
 vim.opt.wrap = true
@@ -50,7 +50,6 @@ vim.opt.syntax = 'on'
 vim.opt.encoding = 'utf-8'
 vim.opt.completeopt = 'menu,menuone,noselect'
 vim.opt.termguicolors = true
-vim.opt.conceallevel = 1
 
 
 ----------------------------
diff --git a/nvim/keymaps.lua b/nvim/keymaps.lua
index b704489..8110e08 100644
--- a/nvim/keymaps.lua
+++ b/nvim/keymaps.lua
@@ -52,5 +52,25 @@ vim.keymap.set({"n","x"}, "y", "<Plug>(YankyYank)")
 -- Undotree
 vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
 
+-- DAP
+vim.keymap.set('n', '<Leader>db', function() require('dap').toggle_breakpoint() end)
+vim.keymap.set('n', '<Leader>dB', function() require('dap').set_breakpoint() end)
+vim.keymap.set('n', "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end)
+vim.keymap.set('n', "<leader>dc", function() require("dap").continue() end)
+vim.keymap.set('n', "<leader>da", function() require("dap").continue({ before = get_args }) end)
+vim.keymap.set('n', "<leader>dC", function() require("dap").run_to_cursor() end)
+vim.keymap.set('n', "<leader>dg", function() require("dap").goto_() end)
+vim.keymap.set('n', "<leader>di", function() require("dap").step_into() end)
+vim.keymap.set('n', "<leader>dj", function() require("dap").down() end)
+vim.keymap.set('n', "<leader>dk", function() require("dap").up() end)
+vim.keymap.set('n', "<leader>dl", function() require("dap").run_last() end)
+vim.keymap.set('n', "<leader>do", function() require("dap").step_over() end)
+vim.keymap.set('n', "<leader>dO", function() require("dap").step_out() end)
+vim.keymap.set('n', "<leader>dP", function() require("dap").pause() end)
+vim.keymap.set('n', "<leader>dr", function() require("dap").repl.toggle() end)
+vim.keymap.set('n', "<leader>ds", function() require("dap").session() end)
+vim.keymap.set('n', "<leader>dt", function() require("dap").terminate() end)
+vim.keymap.set('n', "<leader>dw", function() require("dap.ui.widgets").hover() end)
+
 -- nnoremap <silent> <leader>t :CtrlPBufTagAll<CR>
 -- nnoremap <silent> <leader>T :TagbarToggle<CR>
diff --git a/nvim/plugins.lua b/nvim/plugins.lua
index ea66664..c9de307 100644
--- a/nvim/plugins.lua
+++ b/nvim/plugins.lua
@@ -41,11 +41,11 @@ cmp.setup({
 
   sources = cmp.config.sources({
     { name = 'nvim_lsp' },
-    { name = 'copilot' },
     { name = 'vsnip' },
     { name = 'path' },
     { name = 'cmp_yanky' },
     { name = 'git' },
+    { name = 'copilot' },
   -- }, {
     { name = 'buffer', keyword_length = 2 },
   }),
@@ -161,7 +161,7 @@ require('lualine').setup({
     },
     ignore_focus = {},
     always_divide_middle = true,
-    globalstatus = false,
+    globalstatus = true,
     refresh = {
       statusline = 1000,
       tabline = 1000,
@@ -298,6 +298,7 @@ require("trouble").setup()
 require("todo-comments").setup()
 
 require("dapui").setup()
+require("nvim-dap-virtual-text").setup()
 
 local dap, dapui = require("dap"), require("dapui")
 dap.listeners.before.attach.dapui_config = function()