feat(snacks): use lazygit

lua/lazyvim/config/keymaps.lua

@@ -130,22 +130,14 @@ if vim.lsp.inlay_hint then
 end
 
 -- lazygit
-map("n", "<leader>gg", function() LazyVim.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
-map("n", "<leader>gG", function() LazyVim.lazygit() end, { desc = "Lazygit (cwd)" })
 map("n", "<leader>gb", LazyVim.lazygit.blame_line, { desc = "Git Blame Line" })
+map("n", "<leader>gg", function() Snacks.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
+map("n", "<leader>gG", function() Snacks.lazygit() end, { desc = "Lazygit (cwd)" })
 map("n", "<leader>gB", LazyVim.lazygit.browse, { desc = "Git Browse" })
 
-map("n", "<leader>gf", function()
+map("n", "<leader>gf", function() Snacks.lazygit.log_file() end, { desc = "Lazygit Current File History" })
-  local git_path = vim.api.nvim_buf_get_name(0)
+map("n", "<leader>gl", function() Snacks.lazygit.log({ cwd = LazyVim.root.git() }) end, { desc = "Lazygit Log" })
-  LazyVim.lazygit({args = { "-f", vim.trim(git_path) }, cwd = LazyVim.root.git()})
+map("n", "<leader>gL", function() Snacks.lazygit.log() end, { desc = "Lazygit Log (cwd)" })
-end, { desc = "Lazygit Current File History" })
-
-map("n", "<leader>gl", function()
-  LazyVim.lazygit({ args = { "log" }, cwd = LazyVim.root.git() })
-end, { desc = "Lazygit Log" })
-map("n", "<leader>gL", function()
-  LazyVim.lazygit({ args = { "log" } })
-end, { desc = "Lazygit Log (cwd)" })
 
 -- quit
 map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })

lua/lazyvim/util/lazygit.lua

@@ -1,149 +1,4 @@
 ---@class lazyvim.util.lazygit
----@field config_dir? string
----@overload fun(cmd: string|string[], opts: LazyTermOpts): LazyFloat
-local M = setmetatable({}, {
-  __call = function(m, ...)
-    return m.open(...)
-  end,
-})
-
----@alias LazyGitColor {fg?:string, bg?:string, bold?:boolean}
-
----@class LazyGitTheme: table<number, LazyGitColor>
----@field activeBorderColor LazyGitColor
----@field cherryPickedCommitBgColor LazyGitColor
----@field cherryPickedCommitFgColor LazyGitColor
----@field defaultFgColor LazyGitColor
----@field inactiveBorderColor LazyGitColor
----@field optionsTextColor LazyGitColor
----@field searchingActiveBorderColor LazyGitColor
----@field selectedLineBgColor LazyGitColor
----@field unstagedChangesColor LazyGitColor
-M.theme = {
-  [241] = { fg = "Special" },
-  activeBorderColor = { fg = "MatchParen", bold = true },
-  cherryPickedCommitBgColor = { fg = "Identifier" },
-  cherryPickedCommitFgColor = { fg = "Function" },
-  defaultFgColor = { fg = "Normal" },
-  inactiveBorderColor = { fg = "FloatBorder" },
-  optionsTextColor = { fg = "Function" },
-  searchingActiveBorderColor = { fg = "MatchParen", bold = true },
-  selectedLineBgColor = { bg = "Visual" }, -- set to `default` to have no background colour
-  unstagedChangesColor = { fg = "DiagnosticError" },
-}
-
-M.theme_path = LazyVim.norm(vim.fn.stdpath("cache") .. "/lazygit-theme.yml")
-
--- re-create config file on startup
-M.dirty = true
-
--- re-create theme file on ColorScheme change
-vim.api.nvim_create_autocmd("ColorScheme", {
-  callback = function()
-    M.dirty = true
-  end,
-})
-
--- Opens lazygit
----@param opts? LazyTermOpts | {args?: string[]}
-function M.open(opts)
-  if vim.g.lazygit_theme ~= nil then
-    LazyVim.deprecate("vim.g.lazygit_theme", "vim.g.lazygit_config")
-  end
-
-  opts = vim.tbl_deep_extend("force", {}, {
-    esc_esc = false,
-    ctrl_hjkl = false,
-  }, opts or {})
-
-  local cmd = { "lazygit" }
-  vim.list_extend(cmd, opts.args or {})
-
-  if vim.g.lazygit_config then
-    if M.dirty then
-      M.update_config()
-    end
-
-    if not M.config_dir then
-      local Process = require("lazy.manage.process")
-      local ok, lines = pcall(Process.exec, { "lazygit", "-cd" })
-      if ok then
-        M.config_dir = lines[1]
-        vim.env.LG_CONFIG_FILE = LazyVim.norm(M.config_dir .. "/config.yml" .. "," .. M.theme_path)
-        local custom_config = LazyVim.norm(M.config_dir .. "/custom.yml")
-        if vim.uv.fs_stat(custom_config) and vim.uv.fs_stat(custom_config).type == "file" then
-          vim.env.LG_CONFIG_FILE = vim.env.LG_CONFIG_FILE .. "," .. custom_config
-        end
-      else
-        ---@diagnostic disable-next-line: cast-type-mismatch
-        ---@cast lines string
-        LazyVim.error(
-          { "Failed to get **lazygit** config directory.", "Will not apply **lazygit** config.", "", "# Error:", lines },
-          { title = "lazygit" }
-        )
-      end
-    end
-  end
-
-  return LazyVim.terminal(cmd, opts)
-end
-
-function M.set_ansi_color(idx, color)
-  io.write(("\27]4;%d;%s\7"):format(idx, color))
-end
-
----@param v LazyGitColor
----@return string[]
-function M.get_color(v)
-  ---@type string[]
-  local color = {}
-  if v.fg then
-    color[1] = LazyVim.ui.color(v.fg)
-  elseif v.bg then
-    color[1] = LazyVim.ui.color(v.bg, true)
-  end
-  if v.bold then
-    table.insert(color, "bold")
-  end
-  return color
-end
-
-function M.update_config()
-  ---@type table<string, string[]>
-  local theme = {}
-
-  for k, v in pairs(M.theme) do
-    if type(k) == "number" then
-      local color = M.get_color(v)
-      -- LazyGit uses color 241 a lot, so also set it to a nice color
-      -- pcall, since some terminals don't like this
-      pcall(M.set_ansi_color, k, color[1])
-    else
-      theme[k] = M.get_color(v)
-    end
-  end
-
-  local config = [[
-os:
-  editPreset: "nvim-remote"
-gui:
-  nerdFontsVersion: 3
-  theme:
-]]
-
-  ---@type string[]
-  local lines = {}
-  for k, v in pairs(theme) do
-    lines[#lines + 1] = ("    %s:"):format(k)
-    for _, c in ipairs(v) do
-      lines[#lines + 1] = ("      - %q"):format(c)
-    end
-  end
-  config = config .. table.concat(lines, "\n")
-  require("lazy.util").write_file(M.theme_path, config)
-  M.dirty = false
-end
-
 ---@param opts? {count?: number}|LazyCmdOptions
 function M.blame_line(opts)
   opts = vim.tbl_deep_extend("force", {