diff --git a/modules/home/nixvim/keymaps.nix b/modules/home/nixvim/keymaps.nix
index 7489b3a..3a7ee51 100644
--- a/modules/home/nixvim/keymaps.nix
+++ b/modules/home/nixvim/keymaps.nix
@@ -52,6 +52,12 @@ in {
     (mk "]b" "<Cmd>BufferNext<CR>" "後のバッファーに移動")
     (mk "<leader>bc" "<Cmd>BufferClose<CR>" "バッファーを削除")
 
+    # Git
+    (mk "<leader>gl" "<cmd>LazyGit<CR>" "LazyGitを開く")
+    (mk "<leader>gd" "<cmd>DiffviewOpen<CR>" "差分を開く")
+    (mk "<leader>gH" "<cmd>DiffviewFileHistory<CR>" "リポジトリ履歴")
+    (mk "<leader>gh" "<cmd>DiffviewFileHistory %<CR>" "ファイル履歴")
+
     # Telescope (explicit form for reliability)
     (mkRaw "<leader>ff" "function() require('telescope.builtin').find_files() end" "ファイルを探す")
     (mkRaw "<leader>fg" "function() require('telescope.builtin').live_grep() end" "文字列を全文検索")
diff --git a/modules/home/nixvim/plugins/editor/default.nix b/modules/home/nixvim/plugins/editor/default.nix
index 4808770..6cc090b 100644
--- a/modules/home/nixvim/plugins/editor/default.nix
+++ b/modules/home/nixvim/plugins/editor/default.nix
@@ -11,5 +11,6 @@
     ./trouble.nix
     ./conform.nix
     ./surround.nix
+    ./git.nix
   ];
 }
diff --git a/modules/home/nixvim/plugins/editor/git.nix b/modules/home/nixvim/plugins/editor/git.nix
new file mode 100644
index 0000000..713f896
--- /dev/null
+++ b/modules/home/nixvim/plugins/editor/git.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  programs.nixvim = {
+    extraPackages = [ pkgs.lazygit ];
+
+    plugins = {
+      lazygit.enable = true;
+      diffview.enable = true;
+    };
+  };
+}