diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
index 935f9b4..548d54d 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
@@ -32,17 +32,6 @@ return {
 			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",
 		event = "VeryLazy",
@@ -53,7 +42,6 @@ return {
 			{ "<leader>gG", ":LazyGit<CR>", desc = "Lazygit" },
 		},
 	},
-
 	{
 		"NeogitOrg/neogit",
 		dependencies = {
@@ -63,13 +51,18 @@ return {
 		},
 		config = true,
 		opts = {
-			disable_insert_on_commit = "auto",
-			kind = "replace",
 			disable_line_numbers = false,
 			console_timeout = 8000,
-			-- commit_editor = {
-			-- 	kind = "tab",
-			-- },
+			graph_style = "unicode",
+			kind = "tab",
+			ignored_settings = {
+				"NeogitPushPopup--force-with-lease",
+				"NeogitPushPopup--force",
+				"NeogitPullPopup--rebase",
+				"NeogitCommitPopup--allow-empty",
+				"NeogitCommitPopup--reuse-message",
+				"NeogitRevertPopup--no-edit",
+			},
 		},
 		keys = {
 			{
@@ -79,6 +72,27 @@ return {
 				end,
 				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",
+			},
 		},
 	},
 }
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
index a80c6ef..fcac693 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
@@ -22,7 +22,6 @@ return {
 			require("illuminate").configure(opts)
 		end,
 	},
-	{ "nvim-treesitter/nvim-treesitter-context" },
 	{
 		-- Color Picker
 		"uga-rosa/ccc.nvim",
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua
index 2a7b945..15d2cab 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua
@@ -63,6 +63,7 @@ return {
 				{ mode = "n", keys = "<Leader>a", desc = "+ChatGPT" },
 				{ mode = "v", keys = "<Leader>a", desc = "+ChatGPT" },
 				{ mode = "n", keys = "<Leader>a", desc = "+ChatGPT" },
+				{ mode = "n", keys = "g?", desc = "+Print Debug" },
 			},
 
 			-- Clue window settings
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/telescope.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/telescope.lua
index 880cfb8..f6bb853 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/telescope.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/telescope.lua
@@ -76,7 +76,6 @@ return {
 
 		-- Git
 		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
 		-- Disabled, handle by trouble
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua
index e6c8a81..e98f939 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua
@@ -6,6 +6,7 @@ return {
 		"nvim-treesitter/nvim-treesitter-textobjects",
 		"windwp/nvim-ts-autotag",
 		"JoosepAlviste/nvim-ts-context-commentstring",
+		"nvim-treesitter/nvim-treesitter-context",
 	},
 	build = ":TSUpdate",
 	config = function()
@@ -35,12 +36,6 @@ return {
 			indent = { enable = true },
 			incremental_selection = {
 				enable = true,
-				keymaps = {
-					init_selection = "<c-space>",
-					node_incremental = "<c-space>",
-					scope_incremental = "<c-s>",
-					node_decremental = "<M-space>",
-				},
 			},
 			textobjects = {
 				select = {
diff --git a/chezmoi/dot_config/zsh/aliases/aliases.zsh b/chezmoi/dot_config/zsh/aliases/aliases.zsh
index 5a41377..a0e766d 100644
--- a/chezmoi/dot_config/zsh/aliases/aliases.zsh
+++ b/chezmoi/dot_config/zsh/aliases/aliases.zsh
@@ -36,6 +36,14 @@ alias \
 	du3='dust --reverse --min-size 1M --depth 3' \
 	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
 alias \
 	reload='exec $SHELL -l'