diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua
index e26ad04..2667fe0 100644
--- a/nvim/lua/plugins/snacks.lua
+++ b/nvim/lua/plugins/snacks.lua
@@ -1,3 +1,43 @@
+local function git_show(ref)
+	local git_root = Snacks.git.get_root()
+	local function finder(opts, ctx)
+		return require("snacks.picker.source.proc").proc({
+			opts,
+			{
+				cmd = "git",
+				args = { "show", "--name-status", "--pretty=tformat:", ref },
+				transform = function(item)
+					item.cwd = git_root
+					item.file = string.sub(item.text, 3)
+					item.commit = ref
+				end,
+			},
+		}, ctx)
+	end
+
+	Snacks.picker.pick({
+		title = "Git show " .. ref,
+		finder = finder,
+		preview = "git_show",
+		name = "git_show",
+		confirm = function(picker, item)
+			picker:close()
+			vim.cmd("Gedit " .. ref .. ":" .. item.file)
+		end,
+		actions = {
+			edit_split = function(picker, item)
+				picker:close()
+				vim.cmd("Gsplit " .. ref .. ":" .. item.file)
+			end,
+			edit_vsplit = function(picker, item)
+				picker:close()
+				vim.cmd("Gvsplit " .. ref .. ":" .. item.file)
+			end,
+		}
+
+	})
+end
+
 return {
 	{
 		"snacks-nvim",
@@ -82,7 +122,7 @@ return {
 				actions = {
 					git_show = function(picker, item)
 						picker:close()
-						Snacks.picker.git_show({ ref = item.commit })
+						git_show(item.commit)
 					end,
 				},
 				layouts = {
@@ -173,6 +213,8 @@ return {
 		after = function(plug)
 			require("snacks").setup(plug.opts)
 
+			Snacks.picker.git_show = git_show
+
 			vim.keymap.set("n", "<leader>zz", function() Snacks.zen() end, { desc = "Toggle zen mode" })
 
 			vim.keymap.set("n", "<leader>f", function()
diff --git a/nvim/lua/telescope/_extensions/git_show.lua b/nvim/lua/telescope/_extensions/git_show.lua
deleted file mode 100644
index e95413b..0000000
--- a/nvim/lua/telescope/_extensions/git_show.lua
+++ /dev/null
@@ -1,108 +0,0 @@
-local previewers = require("telescope.previewers")
-local pickers = require("telescope.pickers")
-local finders = require("telescope.finders")
-local make_entry = require "telescope.make_entry"
-local utils = require "telescope.utils"
-local putils = require "telescope.previewers.utils"
-local from_entry = require "telescope.from_entry"
-local conf = require("telescope.config").values
-local actions = require "telescope.actions"
-local action_state = require "telescope.actions.state"
-
-local function tmap(t, f)
-	local t1 = {}
-	for i = 1, #t do
-		t1[i] = f(t[i])
-	end
-	return t1
-end
-
-local git_file_show = function(opts)
-	return previewers.new_buffer_previewer {
-		title = "Git File Diff Preview",
-		get_buffer_by_name = function(_, entry)
-			return entry.value
-		end,
-
-		define_preview = function(self, entry, status)
-			if entry.status and (entry.status == "??" or entry.status == "A ") then
-				local p = from_entry.path(entry, true)
-				if p == nil or p == "" then
-					return
-				end
-				conf.buffer_previewer_maker(p, self.state.bufnr, {
-					bufname = self.state.bufname,
-					winid = self.state.winid,
-				})
-			else
-				putils.job_maker({ "git", "--no-pager", "show", opts.ref, entry.value }, self.state.bufnr, {
-					value = entry.value,
-					bufname = self.state.bufname,
-					cwd = opts.cwd,
-					callback = function(bufnr)
-						if vim.api.nvim_buf_is_valid(bufnr) then
-							putils.regex_highlighter(bufnr, "diff")
-						end
-					end,
-				})
-			end
-		end,
-	}
-end
-
-local git_show = function(opts)
-	opts = opts or {}
-	opts.cwd = opts.cwd or vim.loop.cwd()
-	opts.ref = opts.ref or "HEAD"
-
-	local gen_new_finder = function()
-		local git_cmd = { "git", "show", "--name-status", '--pretty=tformat:', opts.ref }
-		local output = utils.get_os_command_output(git_cmd, opts.cwd)
-		-- We convert {StatusInOneChar}\t{Path} to {StatusInOneChar}{NoStatusInOneChar} {Path} where NoStatusInOneChar is a space.
-		-- This is to conform to git status --porcelaine=v1
-		output = tmap(output, function(x) return string.gsub(x, "\t", "  ", 1) end)
-
-		return finders.new_table {
-			results = output,
-			entry_maker = make_entry.gen_from_git_status(opts),
-		}
-	end
-
-	local initial_finder = gen_new_finder()
-	if not initial_finder then
-		return
-	end
-
-	pickers
-		.new(opts, {
-			prompt_title = "Git show " .. opts.ref,
-			finder = initial_finder,
-			previewer = git_file_show(opts),
-			attach_mappings = function(prompt_bufnr, map)
-				actions.select_default:replace(function()
-					actions.close(prompt_bufnr)
-					local selection = action_state.get_selected_entry()
-					vim.cmd("Gedit " .. opts.ref .. ":" .. selection.value)
-				end)
-				map({ "i", "n" }, "<c-v>", function(bufr)
-					actions.close(bufr)
-					local selection = action_state.get_selected_entry()
-					vim.cmd("Gvsplit " .. opts.ref .. ":" .. selection.value)
-				end)
-				map({ "i", "n" }, "<c-s>", function(bufr)
-					actions.close(bufr)
-					local selection = action_state.get_selected_entry()
-					vim.cmd("Gsplit " .. opts.ref .. ":" .. selection.value)
-				end)
-				return true
-			end,
-		})
-		:find()
-end
-
-return require("telescope").register_extension {
-	setup = function() end,
-	exports = {
-		git_show = git_show
-	},
-}