Compare commits
No commits in common. "71d8248db3b251a027e9753786d7c15feb03cc70" and "61398a659cbc44739c2b53ea9378782c9894f600" have entirely different histories.
71d8248db3
...
61398a659c
6 changed files with 4 additions and 115 deletions
|
|
@ -4,7 +4,6 @@
|
||||||
"catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" },
|
"catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" },
|
||||||
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
|
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
|
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
|
||||||
"dadbod-ui-yank": { "branch": "master", "commit": "b0fe1062485ce4fd44f4f41a1fe56090e7152843" },
|
|
||||||
"flatten.nvim": { "branch": "main", "commit": "72527798e75b5e34757491947c2cb853ce21dc0e" },
|
"flatten.nvim": { "branch": "main", "commit": "72527798e75b5e34757491947c2cb853ce21dc0e" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||||
"fzf-lua": { "branch": "main", "commit": "758173f499d15410ecb50c5519a41b27c33e645d" },
|
"fzf-lua": { "branch": "main", "commit": "758173f499d15410ecb50c5519a41b27c33e645d" },
|
||||||
|
|
@ -16,9 +15,6 @@
|
||||||
"mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" },
|
"mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" },
|
||||||
"neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" },
|
"neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "5dd4d50f2e6a2eaf9e57fad023d294ef371bda35" },
|
|
||||||
"nvim-dap-view": { "branch": "main", "commit": "390dae6bf67f3342ebb481159932ef0fe54822ba" },
|
|
||||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
|
||||||
"nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" },
|
"nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
|
"nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
|
|
@ -27,7 +23,6 @@
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
"render-markdown": { "branch": "main", "commit": "4a39681990fb515d00dd898de3d7bf2973805f1a" },
|
"render-markdown": { "branch": "main", "commit": "4a39681990fb515d00dd898de3d7bf2973805f1a" },
|
||||||
"rustaceanvim": { "branch": "master", "commit": "66398662c07d265b226897500ed50eafba3dffb4" },
|
|
||||||
"smart-splits.nvim": { "branch": "master", "commit": "5ef94ca23b28148187846fc46f10184aad4d17b0" },
|
"smart-splits.nvim": { "branch": "master", "commit": "5ef94ca23b28148187846fc46f10184aad4d17b0" },
|
||||||
"transfer.nvim": { "branch": "main", "commit": "ab12253c09f83a5b0b6ee108fc131be45abe446a" },
|
"transfer.nvim": { "branch": "main", "commit": "ab12253c09f83a5b0b6ee108fc131be45abe446a" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
|
|
|
||||||
|
|
@ -156,11 +156,9 @@ vim.lsp.enable({
|
||||||
"nushell",
|
"nushell",
|
||||||
"pyright",
|
"pyright",
|
||||||
"ruff",
|
"ruff",
|
||||||
-- "rust_analyzer", -- managed by rustacean.nvim
|
"rust_analyzer",
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.lsp.inlay_hint.enable(true)
|
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_lines = { current_line = true },
|
virtual_lines = { current_line = true },
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ return { {
|
||||||
"DBUIFindBuffer",
|
"DBUIFindBuffer",
|
||||||
},
|
},
|
||||||
keys = {
|
keys = {
|
||||||
{ "<Leader>uD", "<CMD>DBUIToggle<CR>", desc = "Toggle DB UI" },
|
{ "<Leader>ud", "<CMD>DBUIToggle<CR>", desc = "Toggle DB UI" },
|
||||||
},
|
},
|
||||||
init = function()
|
init = function()
|
||||||
-- Your DBUI configuration
|
-- Your DBUI configuration
|
||||||
|
|
|
||||||
|
|
@ -6,93 +6,8 @@ return {
|
||||||
"igorlfs/nvim-dap-view",
|
"igorlfs/nvim-dap-view",
|
||||||
---@module 'dap-view'
|
---@module 'dap-view'
|
||||||
---@type dapview.Config
|
---@type dapview.Config
|
||||||
opts = {
|
opts = {},
|
||||||
auto_toggle = true,
|
|
||||||
switchbuf = "useopen,uselast",
|
|
||||||
winbar = {
|
|
||||||
sections = { "watches", "scopes", "breakpoints", "repl", "console" },
|
|
||||||
controls = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
},
|
||||||
},
|
|
||||||
windows = {
|
|
||||||
terminal = {
|
|
||||||
start_hidden = true,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local dap = require("dap")
|
|
||||||
|
|
||||||
dap.adapters.codelldb = {
|
|
||||||
type = "executable",
|
|
||||||
command = "codelldb",
|
|
||||||
}
|
|
||||||
|
|
||||||
dap.listeners.before['event_initialized']['toggle_lsp_virtual_text'] = function()
|
|
||||||
vim.lsp.inlay_hint.enable(false)
|
|
||||||
end
|
|
||||||
|
|
||||||
dap.listeners.after['event_terminated']['toggle_lsp_virtual_text'] = function()
|
|
||||||
vim.lsp.inlay_hint.enable(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
require("nvim-dap-virtual-text").setup()
|
|
||||||
end,
|
|
||||||
keys = {
|
|
||||||
{
|
|
||||||
"<leader>dd",
|
|
||||||
function()
|
|
||||||
local dap = require("dap")
|
|
||||||
if dap.status() == "" then
|
|
||||||
dap.run_last()
|
|
||||||
else
|
|
||||||
dap.restart()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
desc = "Run last or restart debugger"
|
|
||||||
},
|
|
||||||
{ "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle breakpoint" },
|
|
||||||
{
|
|
||||||
"<leader>dB",
|
|
||||||
function()
|
|
||||||
vim.ui.input({ prompt = "Breakpoint condition: " }, function(input)
|
|
||||||
require("dap").set_breakpoint(input)
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
desc = "Conditional Breakpoint",
|
|
||||||
},
|
|
||||||
{ "<leader>dw", function() require("dap-view").add_expr() end, desc = "Watch expresion under cursor", mode = { "n", "v" } },
|
|
||||||
{
|
|
||||||
"<leader>dW",
|
|
||||||
function()
|
|
||||||
vim.ui.input({ prompt = "Watch expresion: " }, function(input)
|
|
||||||
require("dap-view").add_expr(input)
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
desc = "Watch expression",
|
|
||||||
},
|
|
||||||
{ "<leader>dj", function() require("dap").step_over() end, desc = "Step over" },
|
|
||||||
{ "<leader>dJ", function() require("dap").continue() end, desc = "Continue" },
|
|
||||||
{ "<leader>dl", function() require("dap").step_into() end, desc = "Step into" },
|
|
||||||
{ "<leader>dk", function() require("dap").step_out() end, desc = "Step out" },
|
|
||||||
{ "<leader>dh", function() require("dap.ui.widgets").hover() end, desc = "Show expresion under cursor" },
|
|
||||||
{ "<leader>dx", function() require("dap").clear_breakpoints() end, desc = "Clear breakpoint" },
|
|
||||||
{ "<leader>dX", function() require("dap").terminate() end, desc = "Terminate" },
|
|
||||||
{ "<leader>ud", function() require("dap-view").toggle(true) end, desc = "Toggle dap-view" },
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"theHamsta/nvim-dap-virtual-text",
|
|
||||||
dependencies = { "mfussenegger/nvim-dap", "nvim-treesitter/nvim-treesitter" },
|
|
||||||
config = function()
|
|
||||||
require('nvim-dap-virtual-text').setup({
|
|
||||||
only_first_definition = false,
|
|
||||||
all_references = true,
|
|
||||||
virt_text_pos = "eol",
|
|
||||||
})
|
|
||||||
end
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,9 +38,4 @@ return {
|
||||||
lazy = false,
|
lazy = false,
|
||||||
priority = 1001,
|
priority = 1001,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
'mrcjkb/rustaceanvim',
|
|
||||||
version = '^6', -- Recommended
|
|
||||||
lazy = false, -- This plugin is already lazy
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,6 @@ return {
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require('mini.icons').setup()
|
require('mini.icons').setup()
|
||||||
|
|
||||||
vim.fn.sign_define("DapBreakpoint", { text = " ", texthl = "DapBreakpoint" })
|
|
||||||
vim.fn.sign_define("DapBreakpointCondition", { text = " ", texthl = "DapBreakpointCondition" })
|
|
||||||
vim.fn.sign_define("DapBreakpointRejected", { text = " ", texthl = "DapBreakpointRejected" })
|
|
||||||
vim.fn.sign_define("DapLogPoint", { text = ".>", texthl = "DapLogPoint" })
|
|
||||||
vim.fn.sign_define("DapStopped", { text = " ", texthl = "DapStopped", numhl = "debugPC" })
|
|
||||||
|
|
||||||
|
|
||||||
require('mini.bracketed').setup({
|
require('mini.bracketed').setup({
|
||||||
diagnostic = { options = { severity = vim.diagnostic.severity.ERROR } },
|
diagnostic = { options = { severity = vim.diagnostic.severity.ERROR } },
|
||||||
})
|
})
|
||||||
|
|
@ -147,12 +139,6 @@ return {
|
||||||
{ mode = "n", keys = "<Leader>b", desc = "+Buffers" },
|
{ mode = "n", keys = "<Leader>b", desc = "+Buffers" },
|
||||||
{ mode = "n", keys = "<Leader>bh", postkeys = "<Leader>b" },
|
{ mode = "n", keys = "<Leader>bh", postkeys = "<Leader>b" },
|
||||||
{ mode = "n", keys = "<Leader>bl", postkeys = "<Leader>b" },
|
{ mode = "n", keys = "<Leader>bl", postkeys = "<Leader>b" },
|
||||||
{ mode = "n", keys = "<Leader>d", desc = "+Debugger" },
|
|
||||||
{ mode = "n", keys = "<Leader>dh", postkeys = "<Leader>d" },
|
|
||||||
{ mode = "n", keys = "<Leader>dJ", postkeys = "<Leader>d" },
|
|
||||||
{ mode = "n", keys = "<Leader>dj", postkeys = "<Leader>d" },
|
|
||||||
{ mode = "n", keys = "<Leader>dk", postkeys = "<Leader>d" },
|
|
||||||
{ mode = "n", keys = "<Leader>dl", postkeys = "<Leader>d" },
|
|
||||||
{ mode = "n", keys = "<Leader>f", desc = "+Find" },
|
{ mode = "n", keys = "<Leader>f", desc = "+Find" },
|
||||||
{ mode = "n", keys = "<Leader>g", desc = "+Git" },
|
{ mode = "n", keys = "<Leader>g", desc = "+Git" },
|
||||||
{ mode = "n", keys = "<Leader>l", desc = "+LSP" },
|
{ mode = "n", keys = "<Leader>l", desc = "+LSP" },
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue