some changes
This commit is contained in:
parent
8cd6349334
commit
96f1792c09
3 changed files with 93 additions and 73 deletions
|
|
@ -40,6 +40,18 @@ vim.o.undofile = true
|
||||||
-- instead raise a dialog asking if you wish to save the current file(s) See `:help 'confirm'`
|
-- instead raise a dialog asking if you wish to save the current file(s) See `:help 'confirm'`
|
||||||
vim.o.confirm = true
|
vim.o.confirm = true
|
||||||
|
|
||||||
|
-- local toggle_background = function (obj)
|
||||||
|
-- print(string.find(obj.stdout, "prefer-light"))
|
||||||
|
-- if string.find(obj.stdout, "prefer-light") then
|
||||||
|
-- print('light')
|
||||||
|
-- else
|
||||||
|
-- print('dark')
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
--
|
||||||
|
-- vim.o.background = 'light'
|
||||||
|
-- vim.system({"dconf", "read", "/org/gnome/desktop/interface/color-scheme"}, toggle_background)
|
||||||
|
|
||||||
vim.cmd.colorscheme("gruvbox")
|
vim.cmd.colorscheme("gruvbox")
|
||||||
|
|
||||||
-- [[ Set up keymaps ]] See `:h vim.keymap.set()`, `:h mapping`, `:h keycodes`
|
-- [[ Set up keymaps ]] See `:h vim.keymap.set()`, `:h mapping`, `:h keycodes`
|
||||||
|
|
@ -110,10 +122,10 @@ vim.filetype.add({
|
||||||
|
|
||||||
-- Install nvim-treesitter
|
-- Install nvim-treesitter
|
||||||
vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter" })
|
vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter" })
|
||||||
require("nvim-treesitter").setup()
|
require("nvim-treesitter").install({ 'fish', 'java', 'latex', 'make'})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('FileType', {
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
pattern = {'<filetype>', 'tex'},
|
pattern = {'<filetype>'},
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.treesitter.start()
|
vim.treesitter.start()
|
||||||
end,
|
end,
|
||||||
|
|
@ -153,73 +165,75 @@ vim.keymap.set("n", "<leader>dN", "]D", { desc = "Jump to last diagnostic" })
|
||||||
vim.keymap.set("n", "<leader>dP", "[D", { desc = "Jump to first diagnostic" })
|
vim.keymap.set("n", "<leader>dP", "[D", { desc = "Jump to first diagnostic" })
|
||||||
vim.keymap.set("n", "<leader>ds", "<C-w>d", { desc = "Display diagnostic on current line" })
|
vim.keymap.set("n", "<leader>ds", "<C-w>d", { desc = "Display diagnostic on current line" })
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
pattern = {'c', 'cpp', 'rust'},
|
||||||
|
callback = function()
|
||||||
|
vim.pack.add({ "https://github.com/mfussenegger/nvim-dap", "https://github.com/theHamsta/nvim-dap-virtual-text" })
|
||||||
|
local dap = require("dap")
|
||||||
|
local dap_widgets = require("dap.ui.widgets")
|
||||||
|
local dap_sidebar_s = dap_widgets.sidebar(dap_widgets.scopes)
|
||||||
|
local dap_sidebar_f = dap_widgets.sidebar(dap_widgets.frames)
|
||||||
|
|
||||||
vim.api.nvim_create_user_command("DapInit", function()
|
vim.keymap.set("n", "<leader>bb", dap.toggle_breakpoint, { desc = "Toggle breakpoint" })
|
||||||
vim.pack.add({ "https://github.com/mfussenegger/nvim-dap" })
|
vim.keymap.set("n", "<leader>bc", dap.continue, { desc = "Continue execution" })
|
||||||
|
dap.listeners.on_session["debug"] = function()
|
||||||
|
vim.keymap.set("n", "<leader>bs", dap_sidebar_s.toggle, { desc = "Toggle scopes" })
|
||||||
|
vim.keymap.set("n", "<leader>bf", dap_sidebar_f.toggle, { desc = "Toggle frames" })
|
||||||
|
vim.keymap.set("n", "<leader>br", dap.repl.toggle, { desc = "Toggle REPL"})
|
||||||
|
|
||||||
local dap = require("dap")
|
vim.keymap.set("n", "<Left>", dap.step_out, { desc = "Step out" })
|
||||||
local dap_widgets = require("dap.ui.widgets")
|
vim.keymap.set("n", "<Right>", dap.step_into, { desc = "Step into" })
|
||||||
local dap_sidebar_s = dap_widgets.sidebar(dap_widgets.scopes)
|
vim.keymap.set("n", "<Down>", dap.step_over, { desc = "Step over" })
|
||||||
local dap_sidebar_f = dap_widgets.sidebar(dap_widgets.frames)
|
vim.keymap.set("n", "<Up>", dap.restart_frame, { desc = "Restart frame" })
|
||||||
|
end
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>bb", dap.toggle_breakpoint, { desc = "Toggle breakpoint" })
|
dap.adapters.gdb = {
|
||||||
vim.keymap.set("n", "<leader>bc", dap.continue, { desc = "Continue execution" })
|
type = "executable",
|
||||||
dap.listeners.on_session["debug"] = function()
|
command = "gdb",
|
||||||
vim.keymap.set("n", "<leader>bs", dap_sidebar_s.toggle, { desc = "Show scopes" })
|
args = { "--interpreter=dap", "--eval-command", "set print pretty on" }
|
||||||
vim.keymap.set("n", "<leader>bf", dap_sidebar_f.toggle, { desc = "Show frames" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<Left>", dap.step_out, { desc = "Step out" })
|
|
||||||
vim.keymap.set("n", "<Right>", dap.step_into, { desc = "Step into" })
|
|
||||||
vim.keymap.set("n", "<Down>", dap.step_over, { desc = "Step over" })
|
|
||||||
vim.keymap.set("n", "<Up>", dap.restart_frame, { desc = "Restart frame" })
|
|
||||||
end
|
|
||||||
|
|
||||||
dap.adapters.gdb = {
|
|
||||||
type = "executable",
|
|
||||||
command = "gdb",
|
|
||||||
args = { "--interpreter=dap", "--eval-command", "set print pretty on" }
|
|
||||||
}
|
|
||||||
|
|
||||||
dap.configurations.c = {
|
|
||||||
{
|
|
||||||
name = "Launch",
|
|
||||||
type = "gdb",
|
|
||||||
request = "launch",
|
|
||||||
program = function()
|
|
||||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
|
||||||
end,
|
|
||||||
args = {}, -- provide arguments if needed
|
|
||||||
cwd = "${workspaceFolder}",
|
|
||||||
stopAtBeginningOfMainSubprogram = false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name = "Select and attach to process",
|
|
||||||
type = "gdb",
|
|
||||||
request = "attach",
|
|
||||||
program = function()
|
|
||||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
|
||||||
end,
|
|
||||||
pid = function()
|
|
||||||
local name = vim.fn.input('Executable name (filter): ')
|
|
||||||
return require("dap.utils").pick_process({ filter = name })
|
|
||||||
end,
|
|
||||||
cwd = '${workspaceFolder}'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name = 'Attach to gdbserver :1234',
|
|
||||||
type = 'gdb',
|
|
||||||
request = 'attach',
|
|
||||||
target = 'localhost:1234',
|
|
||||||
program = function()
|
|
||||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
|
||||||
end,
|
|
||||||
cwd = '${workspaceFolder}'
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
dap.configurations.cpp = dap.configurations.c
|
dap.configurations.c = {
|
||||||
dap.configurations.rust = dap.configurations.c
|
{
|
||||||
end, { desc = "Initialize Debug Adater Protocol support" })
|
name = "Launch",
|
||||||
|
type = "gdb",
|
||||||
|
request = "launch",
|
||||||
|
program = function()
|
||||||
|
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||||
|
end,
|
||||||
|
args = {}, -- provide arguments if needed
|
||||||
|
cwd = "${workspaceFolder}",
|
||||||
|
stopAtBeginningOfMainSubprogram = false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name = "Select and attach to process",
|
||||||
|
type = "gdb",
|
||||||
|
request = "attach",
|
||||||
|
program = function()
|
||||||
|
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||||
|
end,
|
||||||
|
pid = function()
|
||||||
|
local name = vim.fn.input('Executable name (filter): ')
|
||||||
|
return require("dap.utils").pick_process({ filter = name })
|
||||||
|
end,
|
||||||
|
cwd = '${workspaceFolder}'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name = 'Attach to gdbserver :1234',
|
||||||
|
type = 'gdb',
|
||||||
|
request = 'attach',
|
||||||
|
target = 'localhost:1234',
|
||||||
|
program = function()
|
||||||
|
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||||
|
end,
|
||||||
|
cwd = '${workspaceFolder}'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dap.configurations.cpp = dap.configurations.c
|
||||||
|
dap.configurations.rust = dap.configurations.c
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- [[ UI Configuration ]]
|
-- [[ UI Configuration ]]
|
||||||
vim.pack.add({ "https://github.com/nvim-mini/mini.nvim" })
|
vim.pack.add({ "https://github.com/nvim-mini/mini.nvim" })
|
||||||
|
|
|
||||||
|
|
@ -147,15 +147,17 @@ return {
|
||||||
forwardSearch = {
|
forwardSearch = {
|
||||||
executable = 'sioyek',
|
executable = 'sioyek',
|
||||||
args = {
|
args = {
|
||||||
'--inverse-search',
|
'--reuse-window',
|
||||||
'--reuse-instance',
|
'--execute-command',
|
||||||
'file:%p#src:%l%f',
|
'toggle_synctex',
|
||||||
'--forward-search-file',
|
'--inverse-search',
|
||||||
'%f',
|
'texlab inverse-search -i \"%%1\" -l %%2',
|
||||||
'--forward-search-line',
|
'--forward-search-file',
|
||||||
'%l',
|
'%f',
|
||||||
'%p'
|
'--forward-search-line',
|
||||||
},
|
'%l',
|
||||||
|
'%p',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
chktex = {
|
chktex = {
|
||||||
onOpenAndSave = false,
|
onOpenAndSave = false,
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,10 @@
|
||||||
"rev": "cdfd55a133f63228c55f91378f12908cb2a78ded",
|
"rev": "cdfd55a133f63228c55f91378f12908cb2a78ded",
|
||||||
"src": "https://github.com/mfussenegger/nvim-dap"
|
"src": "https://github.com/mfussenegger/nvim-dap"
|
||||||
},
|
},
|
||||||
|
"nvim-dap-ui": {
|
||||||
|
"rev": "cf91d5e2d07c72903d052f5207511bf7ecdb7122",
|
||||||
|
"src": "https://github.com/rcarriga/nvim-dap-ui"
|
||||||
|
},
|
||||||
"nvim-dap-virtual-text": {
|
"nvim-dap-virtual-text": {
|
||||||
"rev": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6",
|
"rev": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6",
|
||||||
"src": "https://github.com/theHamsta/nvim-dap-virtual-text"
|
"src": "https://github.com/theHamsta/nvim-dap-virtual-text"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue