updates plugins
This commit is contained in:
parent
007ba4db83
commit
1099c2772d
9 changed files with 38 additions and 123 deletions
|
@ -6,8 +6,3 @@ vim.api.nvim_create_autocmd("Filetype", {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
command = "setlocal formatoptions-=c formatoptions-=r formatoptions-=o"
|
command = "setlocal formatoptions-=c formatoptions-=r formatoptions-=o"
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("FocusLost", {
|
|
||||||
pattern = "*",
|
|
||||||
command = ":wa"
|
|
||||||
})
|
|
||||||
|
|
|
@ -4,4 +4,4 @@ vim.api.nvim_set_option("statusline", " ")
|
||||||
|
|
||||||
-- tabline
|
-- tabline
|
||||||
-- always show tabline (0 = never, 1 = only with at least 2 tabs, 2 = always) and colors
|
-- always show tabline (0 = never, 1 = only with at least 2 tabs, 2 = always) and colors
|
||||||
vim.api.nvim_set_option("showtabline", 2)
|
vim.api.nvim_set_option("showtabline", 1)
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"akinsho/bufferline.nvim",
|
|
||||||
config = function()
|
|
||||||
require("bufferline").setup({
|
|
||||||
options = {
|
|
||||||
offsets = {
|
|
||||||
{
|
|
||||||
filetype = "netrw",
|
|
||||||
text = "File Explorer",
|
|
||||||
highlight = "Directory",
|
|
||||||
text_align = 'center',
|
|
||||||
separator = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
show_buffer_close_icons = false,
|
|
||||||
},
|
|
||||||
highlights = {
|
|
||||||
buffer_selected = {
|
|
||||||
fg = "#dfa000",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,17 +2,18 @@ return {
|
||||||
{
|
{
|
||||||
'tpope/vim-fugitive',
|
'tpope/vim-fugitive',
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>GG", "<cmd>Git <cr>", desc = "git" },
|
{ "<leader>gG", "<cmd>Git <cr>", desc = "git" },
|
||||||
{ "<leader>Gs", "<cmd>Git status <cr>", desc = "git status" },
|
{ "<leader>gs", "<cmd>Git status <cr>", desc = "git status" },
|
||||||
{ "<leader>Gd", "<cmd>Git diff <cr>", desc = "git diff" },
|
{ "<leader>gd", "<cmd>Git diff <cr>", desc = "git diff" },
|
||||||
{ "<leader>GD", "<cmd>Git diff --staged <cr>", desc = "git diff --staged" },
|
{ "<leader>gD", "<cmd>Git diff --staged <cr>", desc = "git diff --staged" },
|
||||||
{ "<leader>Gl", "<cmd>Git log --graph <cr>", desc = "git log --graph" },
|
{ "<leader>gl", "<cmd>Git log --graph <cr>", desc = "git log --graph" },
|
||||||
{ "<leader>Ga", "<cmd>Git add --interactive <cr>", desc = "git add" },
|
{ "<leader>ga", "<cmd>Git add --interactive <cr>", desc = "git add" },
|
||||||
{ "<leader>GA", "<cmd>Git add -A <cr>", desc = "git add -A " },
|
{ "<leader>gA", "<cmd>Git add -A <cr>", desc = "git add -A " },
|
||||||
{ "<leader>Gc", "<cmd>Git commit <cr>", desc = "git commit" },
|
{ "<leader>gc", "<cmd>Git commit <cr>", desc = "git commit" },
|
||||||
{ "<leader>GC", "<cmd>Git commit --amend <cr>", desc = "git commit --amend " },
|
{ "<leader>gC", "<cmd>Git commit --amend <cr>", desc = "git commit --amend " },
|
||||||
{ "<leader>Gp", "<cmd>Git push <cr>", desc = "git push" },
|
{ "<leader>gCN", "<cmd>Git commit --amend --no-edit <cr>", desc = "git commit --amend " },
|
||||||
{ "<leader>GP", "<cmd>Git pull <cr>", desc = "git pull" },
|
{ "<leader>gp", "<cmd>Git push <cr>", desc = "git push" },
|
||||||
|
{ "<leader>gP", "<cmd>Git pull <cr>", desc = "git pull" },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,20 +30,9 @@ return {
|
||||||
end, { expr = true })
|
end, { expr = true })
|
||||||
|
|
||||||
-- Actions
|
-- Actions
|
||||||
map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
|
map('n', '<leader>gB', function() gs.blame_line { full = true } end)
|
||||||
map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
|
map('n', '<leader>gb', gs.toggle_current_line_blame)
|
||||||
map('n', '<leader>hS', gs.stage_buffer)
|
|
||||||
map('n', '<leader>hu', gs.undo_stage_hunk)
|
|
||||||
map('n', '<leader>hR', gs.reset_buffer)
|
|
||||||
map('n', '<leader>hp', gs.preview_hunk)
|
|
||||||
map('n', '<leader>hb', function() gs.blame_line { full = true } end)
|
|
||||||
map('n', '<leader>tb', gs.toggle_current_line_blame)
|
|
||||||
map('n', '<leader>hd', gs.diffthis)
|
|
||||||
map('n', '<leader>hD', function() gs.diffthis('~') end)
|
|
||||||
map('n', '<leader>td', gs.toggle_deleted)
|
|
||||||
|
|
||||||
-- Text object
|
|
||||||
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"echasnovski/mini.surround",
|
|
||||||
event = "VeryLazy",
|
|
||||||
opts = {
|
|
||||||
mappings = {
|
|
||||||
add = "<leader>sa",
|
|
||||||
delete = "<leader>sd",
|
|
||||||
find = "<leader>sf",
|
|
||||||
find_left = "<leader>sF",
|
|
||||||
highlight = "<leader>sh",
|
|
||||||
replace = "<leader>sr",
|
|
||||||
update_n_lines = "<leader>sn",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
require("mini.surround").setup(opts)
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -12,7 +12,7 @@ return {
|
||||||
{ "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Find Strings in current Buffer" },
|
{ "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Find Strings in current Buffer" },
|
||||||
{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
|
{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
|
||||||
{ "<leader>/", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
|
{ "<leader>/", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
|
||||||
{ "<leader>fl", "<cmd>Telescope grep_string<cr>", desc = "Grep currently hovered String" },
|
{ "<leader>fh", "<cmd>Telescope grep_string<cr>", desc = "Grep currently hovered String" },
|
||||||
{ "<leader>fG", "<cmd>Telescope git_files<cr>", desc = "Find Git Files" },
|
{ "<leader>fG", "<cmd>Telescope git_files<cr>", desc = "Find Git Files" },
|
||||||
{ "<leader>fk", "<cmd>Telescope keymaps<cr>", desc = "List Keymaps" },
|
{ "<leader>fk", "<cmd>Telescope keymaps<cr>", desc = "List Keymaps" },
|
||||||
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Find Recent Files" },
|
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Find Recent Files" },
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"folke/todo-comments.nvim",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
opts = {
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
return {
|
|
||||||
"folke/trouble.nvim",
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
|
||||||
opts = {},
|
|
||||||
config = function()
|
|
||||||
vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
|
|
||||||
vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
|
|
||||||
vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
|
|
||||||
vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
|
|
||||||
vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
|
|
||||||
vim.keymap.set("n", "gr", function() require("trouble").open("lsp_references") end)
|
|
||||||
end
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue