modified plugins/ai.lua, modified plugins/python.lua

2 files changed, 273 insertions, 197 deletions

diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
index baab1f0..227d4f4 100644
--- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
@@ -1,206 +1,283 @@
 return {
 	{
-		"robitx/gp.nvim",
-		init = function()
-			local wk = require("which-key")
-			wk.add({
-				mode = { "n", "v", "x" },
-				{ "<leader>G", group = "GPT" },
-				{ "<leader>Gg", group = "Gp" },
-				{ "<leader>GW", group = "Whisper" },
-			})
-		end,
-		config = function()
-			local function keymapOptions(desc)
-				return {
-					noremap = true,
-					silent = true,
-					nowait = true,
-					desc = desc,
-				}
-			end
-
-			local conf = {
-				-- For customization, refer to Install > Configuration in the Documentation/Readme
-				-- openai_api_key = { "pass", "show", "api/chatGPT/nvim" },
-				openai_api_key = { "pass", "show", "api/chatGPT/nvim" },
-				providers = {
-					openai = {
-						disable = false,
-						endpoint = "https://api.openai.com/v1/chat/completions",
-						-- secret = { "pass", "show", "api/chatGPT/nvim" },
+		"yetone/avante.nvim",
+		-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
+		-- ⚠️ must add this setting! ! !
+		build = vim.fn.has("win32") ~= 0
+				and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
+			or "make",
+		event = "VeryLazy",
+		version = false, -- Never set this value to "*"! Never!
+		---@module 'avante'
+		---@type avante.Config
+		opts = {
+			-- add any opts here
+			-- this file can contain specific instructions for your project
+			instructions_file = "avante.md",
+			-- for example
+			provider = "claude",
+			providers = {
+				claude = {
+					endpoint = "https://api.anthropic.com",
+					model = "claude-sonnet-4-20250514",
+					timeout = 30000, -- Timeout in milliseconds
+					extra_request_body = {
+						temperature = 0.75,
+						max_tokens = 20480,
 					},
 				},
-				hooks = {
-					-- GpInspectPlugin provides a detailed inspection of the plugin state
-					InspectPlugin = function(plugin, params)
-						local bufnr = vim.api.nvim_create_buf(false, true)
-						local copy = vim.deepcopy(plugin)
-						local key = copy.config.openai_api_key or ""
-						copy.config.openai_api_key = key:sub(1, 3) .. string.rep("*", #key - 6) .. key:sub(-3)
-						local plugin_info = string.format("Plugin structure:\n%s", vim.inspect(copy))
-						local params_info = string.format("Command params:\n%s", vim.inspect(params))
-						local lines = vim.split(plugin_info .. "\n" .. params_info, "\n")
-						vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-						vim.api.nvim_win_set_buf(0, bufnr)
-					end,
-
-					-- GpInspectLog for checking the log file
-					InspectLog = function(plugin, params)
-						local log_file = plugin.config.log_file
-						local buffer = plugin.helpers.get_buffer(log_file)
-						if not buffer then
-							vim.cmd("e " .. log_file)
-						else
-							vim.cmd("buffer " .. buffer)
-						end
-					end,
-
-					-- GpImplement rewrites the provided selection/range based on comments in it
-					Implement = function(gp, params)
-						local template = "Having following from {{filename}}:\n\n"
-							.. "```{{filetype}}\n{{selection}}\n```\n\n"
-							.. "Please rewrite this according to the contained instructions."
-							.. "\n\nRespond exclusively with the snippet that should replace the selection above."
-
-						local agent = gp.get_command_agent()
-						gp.logger.info("Implementing selection with agent: " .. agent.name)
-
-						gp.Prompt(
-							params,
-							gp.Target.rewrite,
-							agent,
-							template,
-							nil, -- command will run directly without any prompting for user input
-							nil -- no predefined instructions (e.g. speech-to-text from Whisper)
-						)
-					end,
-
-					-- your own functions can go here, see README for more examples like
-					-- :GpExplain, :GpUnitTests.., :GpTranslator etc.
-
-					-- example of making :%GpChatNew a dedicated command which
-					-- opens new chat with the entire current buffer as a context
-					BufferChatNew = function(gp, _)
-						-- call GpChatNew command in range mode on whole buffer
-						vim.api.nvim_command("%" .. gp.config.cmd_prefix .. "ChatNew")
-					end,
-
-					-- example of adding command which opens new chat dedicated for translation
-					Translator = function(gp, params)
-						local chat_system_prompt = "You are a Translator, please translate between English and Korean."
-						gp.cmd.ChatNew(params, chat_system_prompt)
-
-						-- -- you can also create a chat with a specific fixed agent like this:
-						-- local agent = gp.get_chat_agent("ChatGPT4o")
-						-- gp.cmd.ChatNew(params, chat_system_prompt, agent)
-					end,
-
-					-- example of adding command which writes unit tests for the selected code
-					UnitTests = function(gp, params)
-						local template = "I have the following code from {{filename}}:\n\n"
-							.. "```{{filetype}}\n{{selection}}\n```\n\n"
-							.. "Please respond by writing table driven unit tests for the code above."
-						local agent = gp.get_command_agent()
-						gp.Prompt(params, gp.Target.enew, agent, template)
-					end,
-
-					-- example of adding command which explains the selected code
-					Explain = function(gp, params)
-						local template = "I have the following code from {{filename}}:\n\n"
-							.. "```{{filetype}}\n{{selection}}\n```\n\n"
-							.. "Please respond by explaining the code above."
-						local agent = gp.get_chat_agent()
-						gp.Prompt(params, gp.Target.popup, agent, template)
-					end,
-
-					-- example of usig enew as a function specifying type for the new buffer
-					CodeReview = function(gp, params)
-						local template = "I have the following code from {{filename}}:\n\n"
-							.. "```{{filetype}}\n{{selection}}\n```\n\n"
-							.. "Please analyze for code smells and suggest improvements."
-						local agent = gp.get_chat_agent()
-						gp.Prompt(params, gp.Target.enew("markdown"), agent, template)
-					end,
+				moonshot = {
+					endpoint = "https://api.moonshot.ai/v1",
+					model = "kimi-k2-0711-preview",
+					timeout = 30000, -- Timeout in milliseconds
+					extra_request_body = {
+						temperature = 0.75,
+						max_tokens = 32768,
+					},
+				},
+			},
+		},
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"MunifTanjim/nui.nvim",
+			--- The below dependencies are optional,
+			"echasnovski/mini.pick", -- for file_selector provider mini.pick
+			"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
+			"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
+			"ibhagwan/fzf-lua", -- for file_selector provider fzf
+			"stevearc/dressing.nvim", -- for input provider dressing
+			"folke/snacks.nvim", -- for input provider snacks
+			"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
+			"zbirenbaum/copilot.lua", -- for providers='copilot'
+			{
+				-- support for image pasting
+				"HakonHarnes/img-clip.nvim",
+				event = "VeryLazy",
+				opts = {
+					-- recommended settings
+					default = {
+						embed_image_as_base64 = false,
+						prompt_for_file_name = false,
+						drag_and_drop = {
+							insert_mode = true,
+						},
+						-- required for Windows users
+						use_absolute_path = true,
+					},
+				},
+			},
+			{
+				-- Make sure to set this up properly if you have lazy=true
+				"MeanderingProgrammer/render-markdown.nvim",
+				opts = {
+					file_types = { "markdown", "Avante" },
 				},
-			}
-			require("gp").setup(conf)
-
-			-- Setup shortcuts here (see Usage > Shortcuts in the Documentation/Readme)
-			vim.keymap.set("n", "<leader>Gc", "<Cmd>GpChatNew<cr>", keymapOptions("New chat"))
-			vim.keymap.set("n", "<leader>Gb", "<Cmd>GpBufferChatNew<cr>", keymapOptions("New buffer chat"))
-			vim.keymap.set("n", "<leader>Gt", "<Cmd>GpChatToggle<cr>", keymapOptions("Toggle chat"))
-			vim.keymap.set("n", "<leader>Gf", "<Cmd>GpChatFinder<cr>", keymapOptions("Chat finder"))
-
-			vim.keymap.set("v", "<leader>Gc", ":<C-u>'<,'>GpChatNew<cr>", keymapOptions("Chat new"))
-			vim.keymap.set("v", "<leader>Gb", ":<C-u>'<,'>GpBufferChatNew<cr>", keymapOptions("Buffer chat new"))
-			vim.keymap.set("v", "<leader>Gp", ":<C-u>'<,'>GpChatPaste<cr>", keymapOptions("Chat paste"))
-			vim.keymap.set("v", "<leader>Gt", ":<C-u>'<,'>GpChatToggle<cr>", keymapOptions("Toggle chat"))
-
-			vim.keymap.set("n", "<leader>Gh", "<Cmd>gpchatnew split<cr>", keymapOptions("New chat split"))
-			vim.keymap.set("n", "<leader>Gv", "<Cmd>gpchatnew vsplit<cr>", keymapOptions("New chat vsplit"))
-			vim.keymap.set("n", "<leader>Gn", "<Cmd>gpchatnew tabnew<cr>", keymapOptions("New chat tabnew"))
-
-			vim.keymap.set("v", "<leader>Gh", ":<C-u>'<,'>GpChatNew split<cr>", keymapOptions("Chat new split"))
-			vim.keymap.set("v", "<leader>Gv", ":<C-u>'<,'>GpChatNew vsplit<cr>", keymapOptions("Chat new vsplit"))
-			vim.keymap.set("v", "<leader>Gn", ":<C-u>'<,'>GpChatNew tabnew<cr>", keymapOptions("Chat new tabnew"))
-
-			-- Prompt commands
-			vim.keymap.set("n", "<leader>Gw", "<Cmd>GpRewrite<cr>", keymapOptions("Inline rewrite"))
-			vim.keymap.set("n", "<leader>Gr", "<Cmd>GpCodeReview<cr>", keymapOptions("Code review"))
-			vim.keymap.set("n", "<leader>G]", "<Cmd>GpAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set("n", "<leader>G[", "<Cmd>GpPrepend<cr>", keymapOptions("Prepend (before)"))
-
-			vim.keymap.set("v", "<leader>Gw", ":<C-u>'<,'>GpRewrite<cr>", keymapOptions("Rewrite"))
-			vim.keymap.set("v", "<leader>Gr", ":<C-u>'<,'>GpCodeReview<cr>", keymapOptions("Code review"))
-			vim.keymap.set("v", "<leader>G]", ":<C-u>'<,'>GpAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set("v", "<leader>G[", ":<C-u>'<,'>GpPrepend<cr>", keymapOptions("Prepend (before)"))
-			vim.keymap.set("v", "<leader>Gi", ":<C-u>'<,'>GpImplement<cr>", keymapOptions("Implement selection"))
-
-			vim.keymap.set("n", "<leader>Ggp", "<Cmd>GpPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set("n", "<leader>Gge", "<Cmd>GpEnew<cr>", keymapOptions("GpEnew"))
-			vim.keymap.set("n", "<leader>Ggc", "<Cmd>GpNew<cr>", keymapOptions("GpNew"))
-			vim.keymap.set("n", "<leader>Ggv", "<Cmd>GpVnew<cr>", keymapOptions("GpVnew"))
-			vim.keymap.set("n", "<leader>Ggn", "<Cmd>GpTabnew<cr>", keymapOptions("GpTabnew"))
-
-			vim.keymap.set("v", "<leader>Ggp", ":<C-u>'<,'>GpPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set("v", "<leader>Gge", ":<C-u>'<,'>GpEnew<cr>", keymapOptions("GpEnew"))
-			vim.keymap.set("v", "<leader>Ggc", ":<C-u>'<,'>GpNew<cr>", keymapOptions("GpNew"))
-			vim.keymap.set("v", "<leader>Ggv", ":<C-u>'<,'>GpVnew<cr>", keymapOptions("GpVnew"))
-			vim.keymap.set("v", "<leader>Ggn", ":<C-u>'<,'>GpTabnew<cr>", keymapOptions("GpTabnew"))
-
-			vim.keymap.set("n", "<leader>Gx", "<Cmd>GpContext<cr>", keymapOptions("Toggle context"))
-			vim.keymap.set("v", "<leader>Gx", ":<C-u>'<,'>GpContext<cr>", keymapOptions("Toggle context"))
-
-			vim.keymap.set({ "n", "v", "x" }, "<leader>Ggs", "<Cmd>GpStop<cr>", keymapOptions("Stop"))
-			vim.keymap.set({ "n", "v", "x" }, "<leader>Gg]", "<Cmd>GpNextAgent<cr>", keymapOptions("Next agent"))
-
-			-- optional Whisper commands with prefix <C-g>w
-			vim.keymap.set("n", "<leader>GWw", "<Cmd>GpWhisper<cr>", keymapOptions("Whisper"))
-			vim.keymap.set("v", "<leader>GWw", ":<C-u>'<,'>GpWhisper<cr>", keymapOptions("Whisper"))
-
-			vim.keymap.set("n", "<leader>GWr", "<Cmd>GpWhisperRewrite<cr>", keymapOptions("Inline rewrite"))
-			vim.keymap.set("n", "<leader>GW]", "<Cmd>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set("n", "<leader>GW[", "<Cmd>GpWhisperPrepend<cr>", keymapOptions("Prepend (before) "))
-
-			vim.keymap.set("v", "<leader>GWr", ":<C-u>'<,'>GpWhisperRewrite<cr>", keymapOptions("Rewrite"))
-			vim.keymap.set("v", "<leader>GW]", ":<C-u>'<,'>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set("v", "<leader>GW[", ":<C-u>'<,'>GpWhisperPrepend<cr>", keymapOptions("Prepend (before)"))
-
-			vim.keymap.set("n", "<leader>GWp", "<Cmd>GpWhisperPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set("n", "<leader>GWe", "<Cmd>GpWhisperEnew<cr>", keymapOptions("Enew"))
-			vim.keymap.set("n", "<leader>GWc", "<Cmd>GpWhisperNew<cr>", keymapOptions("New"))
-			vim.keymap.set("n", "<leader>GWv", "<Cmd>GpWhisperVnew<cr>", keymapOptions("Vnew"))
-			vim.keymap.set("n", "<leader>GWn", "<Cmd>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
-
-			vim.keymap.set("v", "<leader>GWp", ":<C-u>'<,'>GpWhisperPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set("v", "<leader>GWe", ":<C-u>'<,'>GpWhisperEnew<cr>", keymapOptions("Enew"))
-			vim.keymap.set("v", "<leader>GWc", ":<C-u>'<,'>GpWhisperNew<cr>", keymapOptions("New"))
-			vim.keymap.set("v", "<leader>GWv", ":<C-u>'<,'>GpWhisperVnew<cr>", keymapOptions("Vnew"))
-			vim.keymap.set("v", "<leader>GWn", ":<C-u>'<,'>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
-		end,
+				ft = { "markdown", "Avante" },
+			},
+		},
 	},
 	-- {
+	-- 	"robitx/gp.nvim",
+	-- 	init = function()
+	-- 		local wk = require("which-key")
+	-- 		wk.add({
+	-- 			mode = { "n", "v", "x" },
+	-- 			{ "<leader>G", group = "GPT" },
+	-- 			{ "<leader>Gg", group = "Gp" },
+	-- 			{ "<leader>GW", group = "Whisper" },
+	-- 		})
+	-- 	end,
+	-- 	config = function()
+	-- 		local function keymapOptions(desc)
+	-- 			return {
+	-- 				noremap = true,
+	-- 				silent = true,
+	-- 				nowait = true,
+	-- 				desc = desc,
+	-- 			}
+	-- 		end
+	--
+	-- 		local conf = {
+	-- 			-- For customization, refer to Install > Configuration in the Documentation/Readme
+	-- 			-- openai_api_key = { "pass", "show", "api/chatGPT/nvim" },
+	-- 			openai_api_key = { "pass", "show", "api/chatGPT/nvim" },
+	-- 			providers = {
+	-- 				openai = {
+	-- 					disable = false,
+	-- 					endpoint = "https://api.openai.com/v1/chat/completions",
+	-- 					-- secret = { "pass", "show", "api/chatGPT/nvim" },
+	-- 				},
+	-- 			},
+	-- 			hooks = {
+	-- 				-- GpInspectPlugin provides a detailed inspection of the plugin state
+	-- 				InspectPlugin = function(plugin, params)
+	-- 					local bufnr = vim.api.nvim_create_buf(false, true)
+	-- 					local copy = vim.deepcopy(plugin)
+	-- 					local key = copy.config.openai_api_key or ""
+	-- 					copy.config.openai_api_key = key:sub(1, 3) .. string.rep("*", #key - 6) .. key:sub(-3)
+	-- 					local plugin_info = string.format("Plugin structure:\n%s", vim.inspect(copy))
+	-- 					local params_info = string.format("Command params:\n%s", vim.inspect(params))
+	-- 					local lines = vim.split(plugin_info .. "\n" .. params_info, "\n")
+	-- 					vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+	-- 					vim.api.nvim_win_set_buf(0, bufnr)
+	-- 				end,
+	--
+	-- 				-- GpInspectLog for checking the log file
+	-- 				InspectLog = function(plugin, params)
+	-- 					local log_file = plugin.config.log_file
+	-- 					local buffer = plugin.helpers.get_buffer(log_file)
+	-- 					if not buffer then
+	-- 						vim.cmd("e " .. log_file)
+	-- 					else
+	-- 						vim.cmd("buffer " .. buffer)
+	-- 					end
+	-- 				end,
+	--
+	-- 				-- GpImplement rewrites the provided selection/range based on comments in it
+	-- 				Implement = function(gp, params)
+	-- 					local template = "Having following from {{filename}}:\n\n"
+	-- 						.. "```{{filetype}}\n{{selection}}\n```\n\n"
+	-- 						.. "Please rewrite this according to the contained instructions."
+	-- 						.. "\n\nRespond exclusively with the snippet that should replace the selection above."
+	--
+	-- 					local agent = gp.get_command_agent()
+	-- 					gp.logger.info("Implementing selection with agent: " .. agent.name)
+	--
+	-- 					gp.Prompt(
+	-- 						params,
+	-- 						gp.Target.rewrite,
+	-- 						agent,
+	-- 						template,
+	-- 						nil, -- command will run directly without any prompting for user input
+	-- 						nil -- no predefined instructions (e.g. speech-to-text from Whisper)
+	-- 					)
+	-- 				end,
+	--
+	-- 				-- your own functions can go here, see README for more examples like
+	-- 				-- :GpExplain, :GpUnitTests.., :GpTranslator etc.
+	--
+	-- 				-- example of making :%GpChatNew a dedicated command which
+	-- 				-- opens new chat with the entire current buffer as a context
+	-- 				BufferChatNew = function(gp, _)
+	-- 					-- call GpChatNew command in range mode on whole buffer
+	-- 					vim.api.nvim_command("%" .. gp.config.cmd_prefix .. "ChatNew")
+	-- 				end,
+	--
+	-- 				-- example of adding command which opens new chat dedicated for translation
+	-- 				Translator = function(gp, params)
+	-- 					local chat_system_prompt = "You are a Translator, please translate between English and Korean."
+	-- 					gp.cmd.ChatNew(params, chat_system_prompt)
+	--
+	-- 					-- -- you can also create a chat with a specific fixed agent like this:
+	-- 					-- local agent = gp.get_chat_agent("ChatGPT4o")
+	-- 					-- gp.cmd.ChatNew(params, chat_system_prompt, agent)
+	-- 				end,
+	--
+	-- 				-- example of adding command which writes unit tests for the selected code
+	-- 				UnitTests = function(gp, params)
+	-- 					local template = "I have the following code from {{filename}}:\n\n"
+	-- 						.. "```{{filetype}}\n{{selection}}\n```\n\n"
+	-- 						.. "Please respond by writing table driven unit tests for the code above."
+	-- 					local agent = gp.get_command_agent()
+	-- 					gp.Prompt(params, gp.Target.enew, agent, template)
+	-- 				end,
+	--
+	-- 				-- example of adding command which explains the selected code
+	-- 				Explain = function(gp, params)
+	-- 					local template = "I have the following code from {{filename}}:\n\n"
+	-- 						.. "```{{filetype}}\n{{selection}}\n```\n\n"
+	-- 						.. "Please respond by explaining the code above."
+	-- 					local agent = gp.get_chat_agent()
+	-- 					gp.Prompt(params, gp.Target.popup, agent, template)
+	-- 				end,
+	--
+	-- 				-- example of usig enew as a function specifying type for the new buffer
+	-- 				CodeReview = function(gp, params)
+	-- 					local template = "I have the following code from {{filename}}:\n\n"
+	-- 						.. "```{{filetype}}\n{{selection}}\n```\n\n"
+	-- 						.. "Please analyze for code smells and suggest improvements."
+	-- 					local agent = gp.get_chat_agent()
+	-- 					gp.Prompt(params, gp.Target.enew("markdown"), agent, template)
+	-- 				end,
+	-- 			},
+	-- 		}
+	-- 		require("gp").setup(conf)
+	--
+	-- 		-- Setup shortcuts here (see Usage > Shortcuts in the Documentation/Readme)
+	-- 		vim.keymap.set("n", "<leader>Gc", "<Cmd>GpChatNew<cr>", keymapOptions("New chat"))
+	-- 		vim.keymap.set("n", "<leader>Gb", "<Cmd>GpBufferChatNew<cr>", keymapOptions("New buffer chat"))
+	-- 		vim.keymap.set("n", "<leader>Gt", "<Cmd>GpChatToggle<cr>", keymapOptions("Toggle chat"))
+	-- 		vim.keymap.set("n", "<leader>Gf", "<Cmd>GpChatFinder<cr>", keymapOptions("Chat finder"))
+	--
+	-- 		vim.keymap.set("v", "<leader>Gc", ":<C-u>'<,'>GpChatNew<cr>", keymapOptions("Chat new"))
+	-- 		vim.keymap.set("v", "<leader>Gb", ":<C-u>'<,'>GpBufferChatNew<cr>", keymapOptions("Buffer chat new"))
+	-- 		vim.keymap.set("v", "<leader>Gp", ":<C-u>'<,'>GpChatPaste<cr>", keymapOptions("Chat paste"))
+	-- 		vim.keymap.set("v", "<leader>Gt", ":<C-u>'<,'>GpChatToggle<cr>", keymapOptions("Toggle chat"))
+	--
+	-- 		vim.keymap.set("n", "<leader>Gh", "<Cmd>gpchatnew split<cr>", keymapOptions("New chat split"))
+	-- 		vim.keymap.set("n", "<leader>Gv", "<Cmd>gpchatnew vsplit<cr>", keymapOptions("New chat vsplit"))
+	-- 		vim.keymap.set("n", "<leader>Gn", "<Cmd>gpchatnew tabnew<cr>", keymapOptions("New chat tabnew"))
+	--
+	-- 		vim.keymap.set("v", "<leader>Gh", ":<C-u>'<,'>GpChatNew split<cr>", keymapOptions("Chat new split"))
+	-- 		vim.keymap.set("v", "<leader>Gv", ":<C-u>'<,'>GpChatNew vsplit<cr>", keymapOptions("Chat new vsplit"))
+	-- 		vim.keymap.set("v", "<leader>Gn", ":<C-u>'<,'>GpChatNew tabnew<cr>", keymapOptions("Chat new tabnew"))
+	--
+	-- 		-- Prompt commands
+	-- 		vim.keymap.set("n", "<leader>Gw", "<Cmd>GpRewrite<cr>", keymapOptions("Inline rewrite"))
+	-- 		vim.keymap.set("n", "<leader>Gr", "<Cmd>GpCodeReview<cr>", keymapOptions("Code review"))
+	-- 		vim.keymap.set("n", "<leader>G]", "<Cmd>GpAppend<cr>", keymapOptions("Append (after)"))
+	-- 		vim.keymap.set("n", "<leader>G[", "<Cmd>GpPrepend<cr>", keymapOptions("Prepend (before)"))
+	--
+	-- 		vim.keymap.set("v", "<leader>Gw", ":<C-u>'<,'>GpRewrite<cr>", keymapOptions("Rewrite"))
+	-- 		vim.keymap.set("v", "<leader>Gr", ":<C-u>'<,'>GpCodeReview<cr>", keymapOptions("Code review"))
+	-- 		vim.keymap.set("v", "<leader>G]", ":<C-u>'<,'>GpAppend<cr>", keymapOptions("Append (after)"))
+	-- 		vim.keymap.set("v", "<leader>G[", ":<C-u>'<,'>GpPrepend<cr>", keymapOptions("Prepend (before)"))
+	-- 		vim.keymap.set("v", "<leader>Gi", ":<C-u>'<,'>GpImplement<cr>", keymapOptions("Implement selection"))
+	--
+	-- 		vim.keymap.set("n", "<leader>Ggp", "<Cmd>GpPopup<cr>", keymapOptions("Popup"))
+	-- 		vim.keymap.set("n", "<leader>Gge", "<Cmd>GpEnew<cr>", keymapOptions("GpEnew"))
+	-- 		vim.keymap.set("n", "<leader>Ggc", "<Cmd>GpNew<cr>", keymapOptions("GpNew"))
+	-- 		vim.keymap.set("n", "<leader>Ggv", "<Cmd>GpVnew<cr>", keymapOptions("GpVnew"))
+	-- 		vim.keymap.set("n", "<leader>Ggn", "<Cmd>GpTabnew<cr>", keymapOptions("GpTabnew"))
+	--
+	-- 		vim.keymap.set("v", "<leader>Ggp", ":<C-u>'<,'>GpPopup<cr>", keymapOptions("Popup"))
+	-- 		vim.keymap.set("v", "<leader>Gge", ":<C-u>'<,'>GpEnew<cr>", keymapOptions("GpEnew"))
+	-- 		vim.keymap.set("v", "<leader>Ggc", ":<C-u>'<,'>GpNew<cr>", keymapOptions("GpNew"))
+	-- 		vim.keymap.set("v", "<leader>Ggv", ":<C-u>'<,'>GpVnew<cr>", keymapOptions("GpVnew"))
+	-- 		vim.keymap.set("v", "<leader>Ggn", ":<C-u>'<,'>GpTabnew<cr>", keymapOptions("GpTabnew"))
+	--
+	-- 		vim.keymap.set("n", "<leader>Gx", "<Cmd>GpContext<cr>", keymapOptions("Toggle context"))
+	-- 		vim.keymap.set("v", "<leader>Gx", ":<C-u>'<,'>GpContext<cr>", keymapOptions("Toggle context"))
+	--
+	-- 		vim.keymap.set({ "n", "v", "x" }, "<leader>Ggs", "<Cmd>GpStop<cr>", keymapOptions("Stop"))
+	-- 		vim.keymap.set({ "n", "v", "x" }, "<leader>Gg]", "<Cmd>GpNextAgent<cr>", keymapOptions("Next agent"))
+	--
+	-- 		-- optional Whisper commands with prefix <C-g>w
+	-- 		vim.keymap.set("n", "<leader>GWw", "<Cmd>GpWhisper<cr>", keymapOptions("Whisper"))
+	-- 		vim.keymap.set("v", "<leader>GWw", ":<C-u>'<,'>GpWhisper<cr>", keymapOptions("Whisper"))
+	--
+	-- 		vim.keymap.set("n", "<leader>GWr", "<Cmd>GpWhisperRewrite<cr>", keymapOptions("Inline rewrite"))
+	-- 		vim.keymap.set("n", "<leader>GW]", "<Cmd>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
+	-- 		vim.keymap.set("n", "<leader>GW[", "<Cmd>GpWhisperPrepend<cr>", keymapOptions("Prepend (before) "))
+	--
+	-- 		vim.keymap.set("v", "<leader>GWr", ":<C-u>'<,'>GpWhisperRewrite<cr>", keymapOptions("Rewrite"))
+	-- 		vim.keymap.set("v", "<leader>GW]", ":<C-u>'<,'>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
+	-- 		vim.keymap.set("v", "<leader>GW[", ":<C-u>'<,'>GpWhisperPrepend<cr>", keymapOptions("Prepend (before)"))
+	--
+	-- 		vim.keymap.set("n", "<leader>GWp", "<Cmd>GpWhisperPopup<cr>", keymapOptions("Popup"))
+	-- 		vim.keymap.set("n", "<leader>GWe", "<Cmd>GpWhisperEnew<cr>", keymapOptions("Enew"))
+	-- 		vim.keymap.set("n", "<leader>GWc", "<Cmd>GpWhisperNew<cr>", keymapOptions("New"))
+	-- 		vim.keymap.set("n", "<leader>GWv", "<Cmd>GpWhisperVnew<cr>", keymapOptions("Vnew"))
+	-- 		vim.keymap.set("n", "<leader>GWn", "<Cmd>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
+	--
+	-- 		vim.keymap.set("v", "<leader>GWp", ":<C-u>'<,'>GpWhisperPopup<cr>", keymapOptions("Popup"))
+	-- 		vim.keymap.set("v", "<leader>GWe", ":<C-u>'<,'>GpWhisperEnew<cr>", keymapOptions("Enew"))
+	-- 		vim.keymap.set("v", "<leader>GWc", ":<C-u>'<,'>GpWhisperNew<cr>", keymapOptions("New"))
+	-- 		vim.keymap.set("v", "<leader>GWv", ":<C-u>'<,'>GpWhisperVnew<cr>", keymapOptions("Vnew"))
+	-- 		vim.keymap.set("v", "<leader>GWn", ":<C-u>'<,'>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
+	-- 	end,
+	-- },
+	-- {
 	-- 	"zbirenbaum/copilot.lua",
 	-- 	cmd = "Copilot",
 	-- 	build = ":Copilot auth",
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/python.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/python.lua
index bacdd9b..75b1ce7 100644
--- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/python.lua
+++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/python.lua
@@ -28,7 +28,6 @@ return {
 			{ "nvim-telescope/telescope.nvim", branch = "0.1.x", dependencies = { "nvim-lua/plenary.nvim" } },
 		},
 		lazy = false,
-		branch = "regexp", -- This is the regexp branch, use this for the new version
 		ft = "python",
 		init = function()
 			local wk = require("which-key")