From 6507e5b1d4ce79ef67c59108370a8c85fd24001c Mon Sep 17 00:00:00 2001
From: User <user@example.com>
Date: Thu, 25 Jun 2026 08:41:25 +0800
Subject: [PATCH] refactor(kbd): Reorganize version control keybindings

---
 lisp/init-kbd.el | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el
index 88cac76..fa41365 100644
--- a/lisp/init-kbd.el
+++ b/lisp/init-kbd.el
@@ -1,4 +1,4 @@
-;;; init-kbd.el --- keybindings  -*- lexical-binding: t -*-
+;;; init-kbd.el --- keybindings -*- lexical-binding: t -*-
 
 ;;; Commentary:
 
@@ -78,15 +78,14 @@
   "a" 'my-gptel-agent-project
   "i" 'projectile-ibuffer)
 
-;; g for magit
-(general-unbind "C-x g")
+;; v for version control
 (general-def
-  :prefix "C-x g"
-  "s" 'magit-status
+  :prefix "C-x v"
+  "=" 'magit-diff-buffer-file
   "c" 'magit-clone
-  "d" 'magit-diff
-  "b" 'magit-branch
-  "B" 'magit-blame)
+  "i" 'magit-init
+  "l" 'magit-log-buffer-file
+  "h" 'magit-log-buffer-file)
 
 ;; t for modes toggle
 (general-def
@@ -185,11 +184,7 @@
 
 ;; magit
 (general-def (magit-mode-map tokei-mode-map)
-  "C-<tab>" 'my-magit-toggle-parent-section
-  "p" 'magit-section-backward-sibling
-  "M-p" 'magit-section-backward
-  "n" 'magit-section-forward-sibling
-  "M-n" 'magit-section-forward)
+  "C-<tab>" 'my-magit-toggle-parent-section)
 
 ;; sly
 (general-def (sly-mode-map sly-editing-mode-map)
@@ -207,7 +202,11 @@
   "C-q" 'vterm-send-next-key)
 
 ;; eat
-(general-def (eat-semi-char-mode-map eat-line-mode-map eat-char-mode-map eat-eshell-semi-char-mode-map eat-eshell-char-mode-map)
+(general-def (eat-semi-char-mode-map
+	      eat-line-mode-map
+	      eat-char-mode-map
+	      eat-eshell-semi-char-mode-map
+	      eat-eshell-char-mode-map)
   "M-[" nil
   "M-]" nil)
 
@@ -381,7 +380,6 @@
 
   ;; other
   "C-x r b" 'consult-bookmark
-  "C-x v =" 'magit-diff-buffer-file
   "C-;" 'embark-act)
 
 (cond