rm debugger, add jj

This commit is contained in:
iofq 2025-02-03 02:16:10 -06:00
parent 01366c625a
commit 78a7d107e5
3 changed files with 67 additions and 62 deletions

View file

@ -28,7 +28,7 @@ with lib;
extraPython3Packages ? p: [], # Additional python 3 packages extraPython3Packages ? p: [], # Additional python 3 packages
withPython3 ? false, # Build Neovim with Python 3 support? withPython3 ? false, # Build Neovim with Python 3 support?
withRuby ? false, # Build Neovim with Ruby support? withRuby ? false, # Build Neovim with Ruby support?
withNodeJs ? true, # Build Neovim with NodeJS support? withNodeJs ? false, # Build Neovim with NodeJS support?
withSqlite ? true, # Add sqlite? This is a dependency for some plugins withSqlite ? true, # Add sqlite? This is a dependency for some plugins
# You probably don't want to create vi or vim aliases # You probably don't want to create vi or vim aliases
# if the appName is something different than "nvim" # if the appName is something different than "nvim"

View file

@ -32,11 +32,11 @@ with final.pkgs.lib; let
none-ls-nvim none-ls-nvim
nightfox-nvim nightfox-nvim
nvim-autopairs nvim-autopairs
nvim-dap # nvim-dap
nvim-dap-go # nvim-dap-go
nvim-dap-ui # nvim-dap-ui
nvim-lspconfig nvim-lspconfig
nvim-nio # nvim-nio
nvim-treesitter-context nvim-treesitter-context
nvim-treesitter-textobjects nvim-treesitter-textobjects
nvim-treesitter.withAllGrammars nvim-treesitter.withAllGrammars
@ -67,12 +67,16 @@ with final.pkgs.lib; let
# debuggers # debuggers
delve delve
#other
jujutsu
]; ];
in { in {
nvim-pkg = mkNeovim { nvim-pkg = mkNeovim {
plugins = all-plugins; plugins = all-plugins;
appName = "nvim"; appName = "nvim";
extraPackages = basePackages ++ extraPackages; extraPackages = basePackages ++ extraPackages;
withNodeJs = true;
}; };
nvim-min-pkg = mkNeovim { nvim-min-pkg = mkNeovim {
@ -82,6 +86,7 @@ in {
ignoreConfigRegexes = [ ignoreConfigRegexes = [
".*lsp.lua" ".*lsp.lua"
".*debug.lua" ".*debug.lua"
".*ai.lua"
]; ];
}; };

View file

@ -1,57 +1,57 @@
return { -- return {
{ -- {
'rcarriga/nvim-dap-ui', -- 'rcarriga/nvim-dap-ui',
event = 'VeryLazy', -- event = 'VeryLazy',
dependencies = { -- dependencies = {
'nvim-neotest/nvim-nio', -- 'nvim-neotest/nvim-nio',
}, -- },
}, -- },
{ -- {
'mfussenegger/nvim-dap', -- 'mfussenegger/nvim-dap',
event = 'VeryLazy', -- event = 'VeryLazy',
dependencies = { -- dependencies = {
'leoluz/nvim-dap-go', -- 'leoluz/nvim-dap-go',
'rcarriga/nvim-dap-ui', -- 'rcarriga/nvim-dap-ui',
}, -- },
config = function() -- config = function()
local d = require('dap') -- local d = require('dap')
local w = require('dap.ui.widgets') -- local w = require('dap.ui.widgets')
local ui = require('dapui') -- local ui = require('dapui')
require('dap-go').setup() -- require('dap-go').setup()
ui.setup() -- ui.setup()
--
local scopes = nil -- local scopes = nil
vim.keymap.set('n', '<leader>za', function() -- vim.keymap.set('n', '<leader>za', function()
ui.toggle() -- ui.toggle()
end, { desc = 'toggle dapui' }) -- end, { desc = 'toggle dapui' })
vim.keymap.set('n', '<leader>zz', function() -- vim.keymap.set('n', '<leader>zz', function()
d.continue() -- d.continue()
end, { desc = 'start debugger' }) -- end, { desc = 'start debugger' })
vim.keymap.set('n', '<leader>zn', function() -- vim.keymap.set('n', '<leader>zn', function()
d.step_over() -- d.step_over()
end, { desc = 'step over' }) -- end, { desc = 'step over' })
vim.keymap.set('n', '<leader>zi', function() -- vim.keymap.set('n', '<leader>zi', function()
d.step_into() -- d.step_into()
end, { desc = 'step into' }) -- end, { desc = 'step into' })
vim.keymap.set('n', '<leader>zo', function() -- vim.keymap.set('n', '<leader>zo', function()
d.step_out() -- d.step_out()
end, { desc = 'step out' }) -- end, { desc = 'step out' })
vim.keymap.set('n', '<leader>zx', function() -- vim.keymap.set('n', '<leader>zx', function()
d.toggle_breakpoint() -- d.toggle_breakpoint()
end, { desc = 'toggle_breakpoint' }) -- end, { desc = 'toggle_breakpoint' })
vim.keymap.set('n', '<leader>zr', function() -- vim.keymap.set('n', '<leader>zr', function()
d.run_last() -- d.run_last()
end, { desc = 'run prev' }) -- end, { desc = 'run prev' })
vim.keymap.set({ 'n', 'v' }, '<leader>zh', function() -- vim.keymap.set({ 'n', 'v' }, '<leader>zh', function()
ui.eval() -- ui.eval()
end, { desc = 'hover' }) -- end, { desc = 'hover' })
vim.keymap.set({ 'n', 'v' }, '<leader>zp', function() -- vim.keymap.set({ 'n', 'v' }, '<leader>zp', function()
require('dap.ui.widgets').preview() -- require('dap.ui.widgets').preview()
end, { desc = 'preview' }) -- end, { desc = 'preview' })
vim.keymap.set('n', '<leader>zf', function() -- vim.keymap.set('n', '<leader>zf', function()
local widgets = require('dap.ui.widgets') -- local widgets = require('dap.ui.widgets')
widgets.centered_float(widgets.frames) -- widgets.centered_float(widgets.frames)
end, { desc = 'view frames' }) -- end, { desc = 'view frames' })
end, -- end,
}, -- },
} -- }