From a076bdb5bc0ec685ed856d838641b8133c987736 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Wed, 1 Sep 2021 12:52:34 +0200 Subject: [PATCH] feat(neovim): update dap config --- home/editors/default.nix | 2 +- home/editors/neovim/dap.vim | 9 --------- home/editors/neovim/dap/dap.lua | 26 ++++++++++++++++++++++++++ home/editors/neovim/dap/dap.vim | 9 +++++++++ home/editors/neovim/default.nix | 5 +++-- 5 files changed, 39 insertions(+), 12 deletions(-) delete mode 100644 home/editors/neovim/dap.vim create mode 100644 home/editors/neovim/dap/dap.lua create mode 100644 home/editors/neovim/dap/dap.vim diff --git a/home/editors/default.nix b/home/editors/default.nix index 3fcfaa3..6b10877 100644 --- a/home/editors/default.nix +++ b/home/editors/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./lsp.nix ./neovim ]; + imports = [ ./lsp.nix ./dap.nix ./neovim ]; home.packages = with pkgs; [ fzf ripgrep ]; diff --git a/home/editors/neovim/dap.vim b/home/editors/neovim/dap.vim deleted file mode 100644 index 07789d9..0000000 --- a/home/editors/neovim/dap.vim +++ /dev/null @@ -1,9 +0,0 @@ -nnoremap :lua require'dap'.continue() -nnoremap :lua require'dap'.step_over() -nnoremap :lua require'dap'.step_into() -nnoremap :lua require'dap'.step_out() -nnoremap b :lua require'dap'.toggle_breakpoint() -nnoremap B :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: ')) -nnoremap lp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) -nnoremap dr :lua require'dap'.repl.open() -nnoremap dl :lua require'dap'.repl.run_last() diff --git a/home/editors/neovim/dap/dap.lua b/home/editors/neovim/dap/dap.lua new file mode 100644 index 0000000..0ce1187 --- /dev/null +++ b/home/editors/neovim/dap/dap.lua @@ -0,0 +1,26 @@ +local dap = require("dap") + +local function pwd() return io.popen("pwd"):lines()() end + +dap.adapters.netcoredbg = { + type = "executable", + command = "netcoredbg", + args = { + "--interpreter=vscode", + string.format("--engineLogging=%s/netcoredbg.engine.log", XDG_CACHE_HOME), + string.format("--log=%s/netcoredbg.log", XDG_CACHE_HOME), + }, +} + +dap.configurations.cs = { + { + type = "netcoredbg", + name = "launch - netcoredbg", + request = "launch", + program = function() + local dll = io.popen("find bin/Debug/ -maxdepth 2 -name \"*.dll\"") + return pwd() .. "/" .. dll:lines()() + end, + stopAtEntry = true, + }, +} diff --git a/home/editors/neovim/dap/dap.vim b/home/editors/neovim/dap/dap.vim new file mode 100644 index 0000000..80f41f0 --- /dev/null +++ b/home/editors/neovim/dap/dap.vim @@ -0,0 +1,9 @@ +nnoremap dc lua require'dap'.continue() +nnoremap db lua require'dap'.toggle_breakpoint() +nnoremap do lua require'dap'.step_over() +nnoremap di lua require'dap'.step_into() +nnoremap dO lua require'dap'.step_out() +nnoremap dh lua require'dap'.goto() +nnoremap dk lua require'dap.ui.variables'.hover() +nnoremap dr lua require'dap'.repl.open() +nnoremap dl lua require'dap'.repl.run_last() diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix index f87202e..05430b4 100644 --- a/home/editors/neovim/default.nix +++ b/home/editors/neovim/default.nix @@ -48,8 +48,8 @@ in { nvim-lightbulb # dap - # nvim-dap - # nvim-dap-virtual-text + nvim-dap + nvim-dap-virtual-text vim-orgmode ]; @@ -58,6 +58,7 @@ in { + vimLua (readFile ./which-key.lua) + vimLua (readFile ./gitsigns.lua) + readFile ./test.vim + vimLua (readFile ./lsp/extensions.lua) + readFile ./lsp/lsp.vim + vimLua (readFile ./lsp/lsp.lua) + + readFile ./dap/dap.vim + vimLua (readFile ./dap/dap.lua) + vimLua (readFile ./treesitter.lua); withNodeJs = false; withPython3 = false;