diff --git a/lua/plugins/debug.lua b/lua/plugins/debug.lua index 31dfecf5..8de13b24 100644 --- a/lua/plugins/debug.lua +++ b/lua/plugins/debug.lua @@ -1,15 +1,5 @@ --- debug.lua --- --- Shows how to use the DAP plugin to debug your code. --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. That's why it's called --- kickstart.nvim and not kitchen-sink.nvim ;) - return { - -- NOTE: Yes, you can install new plugins here! 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well dependencies = { -- Creates a beautiful debugger UI 'rcarriga/nvim-dap-ui', @@ -25,72 +15,27 @@ return { 'leoluz/nvim-dap-go', }, config = function() - local dap = require 'dap' - local dapui = require 'dapui' + require('dapui').setup() + require('dap-go').setup() - require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_installation = true, + local dap, dapui = require 'dap', require 'dapui' - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, + dap.listeners.before.attach.dapui_config = function() + dapui.open() + end + dap.listeners.before.launch.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 - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - 'delve', - }, - } - - -- Basic debugging keymaps, feel free to change to your liking! - vim.keymap.set('n', '', dap.continue, { desc = 'Debug: Start/Continue' }) - vim.keymap.set('n', '', dap.step_into, { desc = 'Debug: Step Into' }) - vim.keymap.set('n', '', dap.step_over, { desc = 'Debug: Step Over' }) - vim.keymap.set('n', '', dap.step_out, { desc = 'Debug: Step Out' }) - vim.keymap.set('n', 'b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) - vim.keymap.set('n', 'B', function() - dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') - end, { desc = 'Debug: Set Breakpoint' }) - - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| - dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. - icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, - controls = { - icons = { - pause = '⏸', - play = '▶', - step_into = '⏎', - step_over = '⏭', - step_out = '⏮', - step_back = 'b', - run_last = '▶▶', - terminate = '⏹', - disconnect = '⏏', - }, - }, - } - - -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. - vim.keymap.set('n', '', dapui.toggle, { desc = 'Debug: See last session result.' }) - - dap.listeners.after.event_initialized['dapui_config'] = dapui.open - dap.listeners.before.event_terminated['dapui_config'] = dapui.close - dap.listeners.before.event_exited['dapui_config'] = dapui.close - - -- Install golang specific config - require('dap-go').setup { - delve = { - -- On Windows delve must be run attached or it crashes. - -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring - detached = vim.fn.has 'win32' == 0, - }, - } + vim.keymap.set('n', 'db', ':DapToggleBreakpoint') + vim.keymap.set('n', 'dc', ':DapContinue') + vim.keymap.set('n', 'dx', ':DapTerminate') + vim.keymap.set('n', 'do', ':DapStepOver') end, } diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua deleted file mode 100644 index 29f048ee..00000000 --- a/lua/plugins/obsidian.lua +++ /dev/null @@ -1,37 +0,0 @@ -return { - 'epwalsh/obsidian.nvim', - version = '*', -- recommended, use latest release instead of latest commit - lazy = true, - ft = 'markdown', - -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: - -- event = { - -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. - -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/**.md" - -- "BufReadPre path/to/my-vault/**.md", - -- "BufNewFile path/to/my-vault/**.md", - -- }, - dependencies = { - -- Required. - 'nvim-lua/plenary.nvim', - - -- see below for full list of optional dependencies 👇 - }, - opts = { - workspaces = { - -- { - -- name = 'personal', - -- path = '~/Library/Mobile Documents/iCloud~md~obsidian/Documents/Marcs Daily Notes/', - -- }, - -- { - -- name = 'work', - -- path = '~/Library/Mobile Documents/iCloud~md~obsidian/Documents/Inmar Vault - Docs-SMC/', - -- }, - { - name = 'first', - path = '~/Temp/', - }, - }, - - -- see below for full list of options 👇 - }, -}