From 693b23ebe4483939c29eaab0cbfa3e58f9abeb6d Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Thu, 19 Jun 2025 19:04:09 +0200
Subject: [PATCH] Modules/Neovim: Replace gitmessenger with Snacks.git

---
 home/modules/neovim/default.nix  | 23 -----------------------
 home/modules/neovim/mappings.nix |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix
index f3c60e86..bf03967e 100644
--- a/home/modules/neovim/default.nix
+++ b/home/modules/neovim/default.nix
@@ -597,27 +597,6 @@ in {
             config = mkDefaultConfig name;
           };
 
-          gitmessenger = {
-            name = "gitmessenger";
-            pkg = pkgs.vimPlugins.git-messenger-vim;
-            lazy = true;
-            cmd = ["GitMessenger"];
-            init = let
-              mappings = mylib.generators.toLuaObject {
-                git_messenger_no_default_mappings = true;
-                git_messenger_floating_win_opts = {
-                  border = "rounded";
-                };
-              };
-            in ''
-              function()
-                for k, v in pairs(${mappings}) do
-                  vim.g[k] = v
-                end
-              end
-            '';
-          };
-
           gitsigns = rec {
             name = "gitsigns";
             pkg = pkgs.vimPlugins.gitsigns-nvim;
@@ -1981,7 +1960,6 @@ in {
 
           direnv # Automatically load local environments
           flash # Highlight f/F search results
-          gitmessenger # Show last git commit for the current line
           gitsigns # Show git line additions/deletions/changes in the gutter
           haskell-tools # Haskell integration
           illuminate # Highlight usages of word under cursor
@@ -1990,7 +1968,6 @@ in {
 
           jdtls # Eclipse JDT language server integration for Java
           lastplace # Reopen a file at the last editing position
-          # leetcode # Solve leetcode problems
           lint # Lint documents on save
           lspconfig # Language server configurations for different languages
           lualine # Status line
diff --git a/home/modules/neovim/mappings.nix b/home/modules/neovim/mappings.nix
index aacc4f59..d6e07306 100644
--- a/home/modules/neovim/mappings.nix
+++ b/home/modules/neovim/mappings.nix
@@ -684,8 +684,8 @@
     {
       mode = "n";
       key = "<leader>gm";
-      action = "<cmd>GitMessenger<cr>";
-      options.desc = "GitMessenger";
+      action = "<cmd>lua Snacks.git.blame_line()<cr>";
+      options.desc = "Git Blame";
     }
 
     {