Refactor smerge-mode config

Remove +vcs|enable-smerge-mode-maybe, as this is already automatically
enabled when current file is has merge conflicts.

Moved +hydra-smerge to autoloads file, and add it to smerge-mode-hook.

modules/emacs/vc/autoload.el

@@ -50,3 +50,42 @@ info in the `header-line-format' is a good indication."
                   (propertize author 'face 'git-timemachine-minibuffer-author-face)
                   (propertize sha-or-subject 'face 'git-timemachine-minibuffer-detail-face)
                   date-full date-relative))))
+
+;;;###autoload (autoload '+hydra-smerge/body "emacs/vc/autoload" nil nil)
+(defhydra +hydra-smerge (:hint nil
+                         :pre (if (not smerge-mode) (smerge-mode 1))
+                         ;; Disable `smerge-mode' when quitting hydra if
+                         ;; no merge conflicts remain.
+                         :post (smerge-auto-leave))
+    "
+                                                         [smerge]
+  Movement   Keep           Diff              Other
+  ╭─────────────────────────────────────────────────────────╯
+     ^_g_^       [_b_] base       [_<_] upper/base    [_C_] Combine
+     ^_C-k_^     [_u_] upper      [_=_] upper/lower   [_r_] resolve
+     ^_k_ ↑^     [_l_] lower      [_>_] base/lower    [_R_] remove
+     ^_j_ ↓^     [_a_] all        [_H_] hightlight
+     ^_C-j_^     [_RET_] current  [_E_] ediff                 ╭──────────
+     ^_G_^                                                │ [_q_] quit
+"
+    ("g" (progn (goto-char (point-min)) (smerge-next)))
+    ("G" (progn (goto-char (point-max)) (smerge-prev)))
+    ("C-j" smerge-next)
+    ("C-k" smerge-prev)
+    ("j" next-line)
+    ("k" previous-line)
+    ("b" smerge-keep-base)
+    ("u" smerge-keep-upper)
+    ("l" smerge-keep-lower)
+    ("a" smerge-keep-all)
+    ("RET" smerge-keep-current)
+    ("\C-m" smerge-keep-current)
+    ("<" smerge-diff-base-upper)
+    ("=" smerge-diff-upper-lower)
+    (">" smerge-diff-base-lower)
+    ("H" smerge-refine)
+    ("E" smerge-ediff)
+    ("C" smerge-combine-with-next)
+    ("r" smerge-resolve)
+    ("R" smerge-kill-current)
+    ("q" nil :color blue))

modules/emacs/vc/config.el

@@ -33,13 +33,13 @@
 
 
 ;;
-;; `vc'
+;; `vc' (built-in)
 ;;
 
 ;; `vc-hooks'
 (setq vc-make-backup-files nil)
 
-;; `vc-annotate'
+;; `vc-annotate' (built-in)
 (after! vc-annotate
   (set-popup-rules!
     '(("^\\vc-d" :select nil)     ; *vc-diff*
@@ -48,18 +48,8 @@
     '(vc-annotate-mode vc-git-log-view-mode)
     'normal))
 
-;; `smerge-mode'
+;; `smerge-mode' (built-in)
-(defun +vcs|enable-smerge-mode-maybe ()
+(after! smerge-mode
-  "Auto-enable `smerge-mode' when merge conflict is detected."
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward "^<<<<<<< " nil :noerror)
-      (smerge-mode 1)
-      (when (and (featurep 'hydra) +vc-auto-hydra-smerge)
-        (+hydra-smerge/body)))))
-(add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
-
-(after! smerge-mode ; built-in
   (unless EMACS26+
     (with-no-warnings
       (defalias #'smerge-keep-upper #'smerge-keep-mine)
@@ -68,40 +58,5 @@
       (defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
       (defalias #'smerge-diff-base-lower #'smerge-diff-base-other)))
 
-  (defhydra +hydra-smerge (:hint nil
+  (add-hook 'smerge-mode-hook #'+hydra-smerge/body))
-                           :pre (smerge-mode 1)
-                           ;; Disable `smerge-mode' when quitting hydra if
-                           ;; no merge conflicts remain.
-                           :post (smerge-auto-leave))
-    "
-                                                         [smerge]
-  Movement   Keep           Diff              Other
-  ╭─────────────────────────────────────────────────────────╯
-     ^_g_^       [_b_] base       [_<_] upper/base    [_C_] Combine
-     ^_C-k_^     [_u_] upper      [_=_] upper/lower   [_r_] resolve
-     ^_k_ ↑^     [_l_] lower      [_>_] base/lower    [_R_] remove
-     ^_j_ ↓^     [_a_] all        [_H_] hightlight
-     ^_C-j_^     [_RET_] current  [_E_] ediff                 ╭──────────
-     ^_G_^                                                │ [_q_] quit"
-    ("g" (progn (goto-char (point-min)) (smerge-next)))
-    ("G" (progn (goto-char (point-max)) (smerge-prev)))
-    ("C-j" smerge-next)
-    ("C-k" smerge-prev)
-    ("j" next-line)
-    ("k" previous-line)
-    ("b" smerge-keep-base)
-    ("u" smerge-keep-upper)
-    ("l" smerge-keep-lower)
-    ("a" smerge-keep-all)
-    ("RET" smerge-keep-current)
-    ("\C-m" smerge-keep-current)
-    ("<" smerge-diff-base-upper)
-    ("=" smerge-diff-upper-lower)
-    (">" smerge-diff-base-lower)
-    ("H" smerge-refine)
-    ("E" smerge-ediff)
-    ("C" smerge-combine-with-next)
-    ("r" smerge-resolve)
-    ("R" smerge-kill-current)
-    ("q" nil :color blue)))