save
This commit is contained in:
@@ -6,8 +6,8 @@
|
|||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||||
"compile-mode.nvim": { "branch": "nightly", "commit": "a2ee3b791436ff61ddc0a3e0c1d04dfabd1cfef4" },
|
|
||||||
"conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },
|
"conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },
|
||||||
|
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
|
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
|
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
|
||||||
"gruvbox": { "branch": "main", "commit": "68c3460a5d1d1a362318960035c9f3466d5011f5" },
|
"gruvbox": { "branch": "main", "commit": "68c3460a5d1d1a362318960035c9f3466d5011f5" },
|
||||||
@@ -16,13 +16,7 @@
|
|||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
|
"nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" },
|
"nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
|
||||||
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
|
|
||||||
"nvim-dap-lldb": { "branch": "main", "commit": "81273514fdb5107b79090364b57a3ff5570bea21" },
|
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
|
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" },
|
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
|
|
||||||
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" },
|
"nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
|
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
return {
|
|
||||||
"ej-shafran/compile-mode.nvim",
|
|
||||||
branch = "nightly",
|
|
||||||
dependencies = {
|
|
||||||
"nvim-lua/plenary.nvim",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
---@type CompileModeOpts
|
|
||||||
vim.g.compile_mode = {}
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
dependencies = {
|
|
||||||
"leoluz/nvim-dap-go",
|
|
||||||
"rcarriga/nvim-dap-ui",
|
|
||||||
"nvim-neotest/nvim-nio",
|
|
||||||
"williamboman/mason.nvim",
|
|
||||||
"julianolf/nvim-dap-lldb",
|
|
||||||
"mfussenegger/nvim-dap-python",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local dap = require "dap"
|
|
||||||
local ui = require "dapui"
|
|
||||||
|
|
||||||
require("dapui").setup()
|
|
||||||
require("dap-go").setup()
|
|
||||||
require("dap-python").setup()
|
|
||||||
-- require("dap-lldb").setup()
|
|
||||||
|
|
||||||
-- Handled by nvim-dap-go
|
|
||||||
-- dap.adapters.go = {
|
|
||||||
-- type = "server",
|
|
||||||
-- port = "${port}",
|
|
||||||
-- executable = {
|
|
||||||
-- command = "dlv",
|
|
||||||
-- args = { "dap", "-l", "127.0.0.1:${port}" },
|
|
||||||
-- },
|
|
||||||
-- }
|
|
||||||
|
|
||||||
-- dap.adapters.lldb = {
|
|
||||||
-- type = "executable",
|
|
||||||
-- command = "/usr/bin/lldb", -- Adjust path if necessary
|
|
||||||
-- name = "lldb",
|
|
||||||
-- }
|
|
||||||
|
|
||||||
dap.configurations.cpp = {
|
|
||||||
{
|
|
||||||
name = "Launch",
|
|
||||||
type = "lldb",
|
|
||||||
request = "launch",
|
|
||||||
program = function()
|
|
||||||
return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
|
|
||||||
end,
|
|
||||||
cwd = "${workspaceFolder}",
|
|
||||||
stopOnEntry = false,
|
|
||||||
args = {},
|
|
||||||
runInTerminal = false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
dap.configurations.c = dap.configurations.cpp
|
|
||||||
dap.configurations.rust = dap.configurations.cpp
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<space>b", dap.toggle_breakpoint)
|
|
||||||
vim.keymap.set("n", "<space>gb", dap.run_to_cursor)
|
|
||||||
|
|
||||||
-- Eval var under cursor
|
|
||||||
vim.keymap.set("n", "<space>?", function()
|
|
||||||
require("dapui").eval(nil, { enter = true })
|
|
||||||
end)
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>dc", dap.continue)
|
|
||||||
vim.keymap.set("n", "<leader>s", dap.step_into)
|
|
||||||
vim.keymap.set("n", "<leader>n", dap.step_over)
|
|
||||||
vim.keymap.set("n", "<leader>do", dap.step_out)
|
|
||||||
vim.keymap.set("n", "<leader>db", dap.step_back)
|
|
||||||
vim.keymap.set("n", "<leader>dr", dap.restart)
|
|
||||||
|
|
||||||
dap.listeners.before.attach.dapui_config = function()
|
|
||||||
ui.open()
|
|
||||||
end
|
|
||||||
dap.listeners.before.launch.dapui_config = function()
|
|
||||||
ui.open()
|
|
||||||
end
|
|
||||||
dap.listeners.before.event_terminated.dapui_config = function()
|
|
||||||
ui.close()
|
|
||||||
end
|
|
||||||
dap.listeners.before.event_exited.dapui_config = function()
|
|
||||||
ui.close()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,3 +1,18 @@
|
|||||||
return {
|
return {
|
||||||
"tpope/vim-fugitive"
|
{
|
||||||
|
"tpope/vim-fugitive",
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"lewis6991/gitsigns.nvim",
|
||||||
|
opts = {
|
||||||
|
signs = {
|
||||||
|
add = { text = "+" },
|
||||||
|
change = { text = "~" },
|
||||||
|
delete = { text = "_" },
|
||||||
|
topdelete = { text = "‾" },
|
||||||
|
changedelete = { text = "~" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
return {
|
|
||||||
"lewis6991/gitsigns.nvim",
|
|
||||||
opts = {
|
|
||||||
signs = {
|
|
||||||
add = { text = "+" },
|
|
||||||
change = { text = "~" },
|
|
||||||
delete = { text = "_" },
|
|
||||||
topdelete = { text = "‾" },
|
|
||||||
changedelete = { text = "~" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,31 +1,37 @@
|
|||||||
return {
|
return {
|
||||||
"folke/snacks.nvim",
|
-- this is a sort of related
|
||||||
priority = 1000,
|
{
|
||||||
lazy = false,
|
"stevearc/dressing.nvim"
|
||||||
---@type snacks.Config
|
|
||||||
opts = {
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
bigfile = { enabled = true },
|
|
||||||
indent = { enabled = true },
|
|
||||||
input = { enabled = true },
|
|
||||||
quickfile = { enabled = true },
|
|
||||||
statuscolumn = { enabled = true },
|
|
||||||
words = { enabled = true },
|
|
||||||
},
|
},
|
||||||
keys = {
|
{
|
||||||
{
|
"folke/snacks.nvim",
|
||||||
"<leader>t",
|
priority = 1000,
|
||||||
function()
|
lazy = false,
|
||||||
Snacks.terminal()
|
---@type snacks.Config
|
||||||
end,
|
opts = {
|
||||||
|
-- your configuration comes here
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
bigfile = { enabled = true },
|
||||||
|
indent = { enabled = true },
|
||||||
|
input = { enabled = true },
|
||||||
|
quickfile = { enabled = true },
|
||||||
|
statuscolumn = { enabled = true },
|
||||||
|
words = { enabled = true },
|
||||||
},
|
},
|
||||||
{
|
keys = {
|
||||||
"<leader>lg",
|
{
|
||||||
function()
|
"<leader>t",
|
||||||
Snacks.lazygit()
|
function()
|
||||||
end,
|
Snacks.terminal.toggle()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>lg",
|
||||||
|
function()
|
||||||
|
Snacks.lazygit()
|
||||||
|
end,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,36 +1,27 @@
|
|||||||
return {
|
return {
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
|
|
||||||
tag = "0.1.5",
|
tag = "0.1.5",
|
||||||
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
},
|
},
|
||||||
|
|
||||||
config = function()
|
config = function()
|
||||||
require("telescope").setup({})
|
require("telescope").setup {}
|
||||||
|
|
||||||
local builtin = require("telescope.builtin")
|
local builtin = require "telescope.builtin"
|
||||||
vim.keymap.set("n", "<leader>sf", builtin.find_files, {})
|
vim.keymap.set("n", "<leader>sf", builtin.find_files, {})
|
||||||
vim.keymap.set("n", "<C-p>", builtin.git_files, {})
|
vim.keymap.set("n", "<C-p>", builtin.git_files, {})
|
||||||
vim.keymap.set("n", "<leader>ps", function()
|
vim.keymap.set("n", "<leader>vh", builtin.help_tags, {})
|
||||||
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
vim.keymap.set("n", "<leader><leader>", function()
|
||||||
end)
|
builtin.live_grep {
|
||||||
vim.keymap.set("n", "<leader>vh", builtin.help_tags, {})
|
grep_open_files = true,
|
||||||
vim.keymap.set("n", "<leader><leader>", function()
|
prompt_title = "Live Grep in Open Files",
|
||||||
builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
|
}
|
||||||
winblend = 10,
|
end, { desc = "[S]earch [/] in Open Files" })
|
||||||
previewer = false,
|
vim.keymap.set("n", "<leader>sn", function()
|
||||||
}))
|
builtin.find_files { cwd = vim.fn.stdpath "config" }
|
||||||
end, { desc = "[/] Fuzzily search in current buffer" })
|
end, { desc = "[S]earch [N]eovim files" })
|
||||||
vim.keymap.set("n", "<leader>s/", function()
|
end,
|
||||||
builtin.live_grep({
|
|
||||||
grep_open_files = true,
|
|
||||||
prompt_title = "Live Grep in Open Files",
|
|
||||||
})
|
|
||||||
end, { desc = "[S]earch [/] in Open Files" })
|
|
||||||
vim.keymap.set("n", "<leader>sn", function()
|
|
||||||
builtin.find_files({ cwd = vim.fn.stdpath("config") })
|
|
||||||
end, { desc = "[S]earch [N]eovim files" })
|
|
||||||
end,
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,11 +10,6 @@ set("v", "K", ":m '>-2<CR>gv=gv")
|
|||||||
-- file navigation --
|
-- file navigation --
|
||||||
set("n", "-", "<cmd>Oil<CR>", { noremap = true, silent = true, desc = "Open Oil" })
|
set("n", "-", "<cmd>Oil<CR>", { noremap = true, silent = true, desc = "Open Oil" })
|
||||||
|
|
||||||
-- compile --
|
|
||||||
set("n", "<leader>m", ":make<CR>", { noremap = true, silent = false, desc = "Make" })
|
|
||||||
set("n", "<leader>cc", ":Compile<CR>", { noremap = true, silent = false, desc = "Compile" })
|
|
||||||
set("n", "<leader>rc", ":Recompile<CR>", { noremap = true, silent = false, desc = "Recompile" })
|
|
||||||
|
|
||||||
-- terminal --
|
-- terminal --
|
||||||
set("n", "<leader>t", ":below term<CR>i", { noremap = true, silent = true, desc = "Open Terminal Split" })
|
set("n", "<leader>t", ":below term<CR>i", { noremap = true, silent = true, desc = "Open Terminal Split" })
|
||||||
set("t", "<Esc><Esc>", "<C-\\><C-n>", { noremap = true, silent = true, desc = "Exit terminal and goto normal mode" })
|
set("t", "<Esc><Esc>", "<C-\\><C-n>", { noremap = true, silent = true, desc = "Exit terminal and goto normal mode" })
|
||||||
|
|||||||
Reference in New Issue
Block a user