Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
dac76ab4f8
1 changed files with 3 additions and 28 deletions
31
init.lua
31
init.lua
|
|
@ -81,21 +81,7 @@ require("lazy").setup({
|
||||||
end
|
end
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{ 'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons', opts = {} },
|
||||||
'romgrk/barbar.nvim',
|
|
||||||
dependencies = {
|
|
||||||
'lewis6991/gitsigns.nvim',
|
|
||||||
'nvim-tree/nvim-web-devicons',
|
|
||||||
},
|
|
||||||
init = function() vim.g.barbar_auto_setup = false end,
|
|
||||||
opts = {
|
|
||||||
no_name_title = "unnamed",
|
|
||||||
icons = {
|
|
||||||
pinned = { button = '', filename = true },
|
|
||||||
}
|
|
||||||
},
|
|
||||||
version = '^1.0.0',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"kylechui/nvim-surround",
|
"kylechui/nvim-surround",
|
||||||
version = "*",
|
version = "*",
|
||||||
|
|
@ -192,7 +178,7 @@ require("lazy").setup({
|
||||||
vim.cmd.colorscheme "catppuccin-mocha"
|
vim.cmd.colorscheme "catppuccin-mocha"
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
|
{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
|
||||||
{
|
{
|
||||||
'mrcjkb/rustaceanvim',
|
'mrcjkb/rustaceanvim',
|
||||||
version = '^4',
|
version = '^4',
|
||||||
|
|
@ -226,7 +212,7 @@ require("lazy").setup({
|
||||||
'linrongbin16/lsp-progress.nvim',
|
'linrongbin16/lsp-progress.nvim',
|
||||||
opts = {}
|
opts = {}
|
||||||
},
|
},
|
||||||
{ "cappyzawa/trim.nvim", opts = {} },
|
{ "cappyzawa/trim.nvim", opts = {} },
|
||||||
{
|
{
|
||||||
"kdheepak/lazygit.nvim",
|
"kdheepak/lazygit.nvim",
|
||||||
cmd = {
|
cmd = {
|
||||||
|
|
@ -423,17 +409,6 @@ vim.keymap.set("n", "<leader>rr", ":MoltenReevaluateCell<CR>",
|
||||||
vim.keymap.set("v", "<leader>r", ":<C-u>MoltenEvaluateVisual<CR>gv",
|
vim.keymap.set("v", "<leader>r", ":<C-u>MoltenEvaluateVisual<CR>gv",
|
||||||
{ silent = true, desc = "evaluate visual selection" })
|
{ silent = true, desc = "evaluate visual selection" })
|
||||||
|
|
||||||
local opts = { noremap = true, silent = true }
|
|
||||||
local map = vim.api.nvim_set_keymap
|
|
||||||
map('n', '<leader>bdo', "<Cmd>BufferCloseAllButCurrentOrPinned<CR>", opts);
|
|
||||||
map('n', '<leader>bp', '<Cmd>BufferPin<CR>', opts)
|
|
||||||
map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
|
|
||||||
map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
|
|
||||||
map('n', '<A-n>', '<Cmd>BufferMovePrevious<CR>', opts)
|
|
||||||
map('n', '<A-m>', '<Cmd>BufferMoveNext<CR>', opts)
|
|
||||||
map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
|
|
||||||
map('n', '<A-p>', '<Cmd>BufferPick<CR>', opts)
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>fg', '<cmd>lua require("spectre").toggle()<CR>', {
|
vim.keymap.set('n', '<leader>fg', '<cmd>lua require("spectre").toggle()<CR>', {
|
||||||
desc = "Toggle Spectre"
|
desc = "Toggle Spectre"
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue