Update git plugins

This commit is contained in:
Alexander Navarro 2024-03-28 15:35:45 -03:00
parent d870d23e79
commit f8fe8c3551
6 changed files with 41 additions and 25 deletions

View file

@ -32,17 +32,6 @@ return {
end, end,
}, },
}, },
-- Testing main Git plugin
{
"tpope/vim-fugitive",
event = "VeryLazy",
keys = {
{ "<Leader>gL", ":Git log -p -- %<CR>", desc = "Log of open file" },
},
},
{ {
"kdheepak/lazygit.nvim", "kdheepak/lazygit.nvim",
event = "VeryLazy", event = "VeryLazy",
@ -53,7 +42,6 @@ return {
{ "<leader>gG", ":LazyGit<CR>", desc = "Lazygit" }, { "<leader>gG", ":LazyGit<CR>", desc = "Lazygit" },
}, },
}, },
{ {
"NeogitOrg/neogit", "NeogitOrg/neogit",
dependencies = { dependencies = {
@ -63,13 +51,18 @@ return {
}, },
config = true, config = true,
opts = { opts = {
disable_insert_on_commit = "auto",
kind = "replace",
disable_line_numbers = false, disable_line_numbers = false,
console_timeout = 8000, console_timeout = 8000,
-- commit_editor = { graph_style = "unicode",
-- kind = "tab", kind = "tab",
-- }, ignored_settings = {
"NeogitPushPopup--force-with-lease",
"NeogitPushPopup--force",
"NeogitPullPopup--rebase",
"NeogitCommitPopup--allow-empty",
"NeogitCommitPopup--reuse-message",
"NeogitRevertPopup--no-edit",
},
}, },
keys = { keys = {
{ {
@ -79,6 +72,27 @@ return {
end, end,
desc = "Neogit", desc = "Neogit",
}, },
{
"<leader>gc",
function()
require("neogit").open({ "commit" })
end,
desc = "commit",
},
{
"<leader>gp",
function()
require("neogit").open({ "pull" })
end,
desc = "Neogit",
},
{
"<leader>gP",
function()
require("neogit").open({ "push" })
end,
desc = "Neogit",
},
}, },
}, },
} }

View file

@ -22,7 +22,6 @@ return {
require("illuminate").configure(opts) require("illuminate").configure(opts)
end, end,
}, },
{ "nvim-treesitter/nvim-treesitter-context" },
{ {
-- Color Picker -- Color Picker
"uga-rosa/ccc.nvim", "uga-rosa/ccc.nvim",

View file

@ -63,6 +63,7 @@ return {
{ mode = "n", keys = "<Leader>a", desc = "+ChatGPT" }, { mode = "n", keys = "<Leader>a", desc = "+ChatGPT" },
{ mode = "v", keys = "<Leader>a", desc = "+ChatGPT" }, { mode = "v", keys = "<Leader>a", desc = "+ChatGPT" },
{ mode = "n", keys = "<Leader>a", desc = "+ChatGPT" }, { mode = "n", keys = "<Leader>a", desc = "+ChatGPT" },
{ mode = "n", keys = "g?", desc = "+Print Debug" },
}, },
-- Clue window settings -- Clue window settings

View file

@ -76,7 +76,6 @@ return {
-- Git -- Git
vim.keymap.set("n", "<leader>gb", builtin.git_branches, { desc = "Change branch" }) vim.keymap.set("n", "<leader>gb", builtin.git_branches, { desc = "Change branch" })
vim.keymap.set("n", "<leader>gc", builtin.git_bcommits, { desc = "Commits of buffer" })
-- Diagnosticos -- Diagnosticos
-- Disabled, handle by trouble -- Disabled, handle by trouble

View file

@ -6,6 +6,7 @@ return {
"nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/nvim-treesitter-textobjects",
"windwp/nvim-ts-autotag", "windwp/nvim-ts-autotag",
"JoosepAlviste/nvim-ts-context-commentstring", "JoosepAlviste/nvim-ts-context-commentstring",
"nvim-treesitter/nvim-treesitter-context",
}, },
build = ":TSUpdate", build = ":TSUpdate",
config = function() config = function()
@ -35,12 +36,6 @@ return {
indent = { enable = true }, indent = { enable = true },
incremental_selection = { incremental_selection = {
enable = true, enable = true,
keymaps = {
init_selection = "<c-space>",
node_incremental = "<c-space>",
scope_incremental = "<c-s>",
node_decremental = "<M-space>",
},
}, },
textobjects = { textobjects = {
select = { select = {

View file

@ -36,6 +36,14 @@ alias \
du3='dust --reverse --min-size 1M --depth 3' \ du3='dust --reverse --min-size 1M --depth 3' \
cat='bat' cat='bat'
alias \
dco='docker compose' \
dps="docker ps --format 'table {{.ID}}\t{{.Names}}\t{{.State}}\t{{.Status}}\t{{.RunningFor}}'"
alias \
pco='podman compose' \
pps="podman ps --format 'table {{.ID}}\t{{.Names}}\t{{.State}}\t{{.Status}}\t{{.RunningFor}}'"
# Misc # Misc
alias \ alias \
reload='exec $SHELL -l' reload='exec $SHELL -l'