diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el
index 900bd3e..3a922ca 100644
--- a/flakes/emacs/config/init.el
+++ b/flakes/emacs/config/init.el
@@ -121,14 +121,15 @@
   (denote-rename-buffer-mode 1))
 
 (use-package diff-hl
-  :hook ((prog-mode . diff-hl-mode)
-         (dired-mode . diff-hl-dired-mode)
-         (magit-post-refresh . diff-hl-magit-post-refresh))
+  :init
+  (global-diff-hl-mode 1)
+  (diff-hl-flydiff-mode 1)
+  :hook
+  (dired-mode . diff-hl-dired-mode)
+  (vc-checkin . diff-hl-update)
   :config
-  (diff-hl-flydiff-mode)
   (unless (display-graphic-p)
-    (diff-hl-margin-mode 1))
-  (global-diff-hl-mode))
+    (diff-hl-margin-mode 1)))
 
 (use-package dired
   :init
@@ -436,8 +437,10 @@
   (global-ligature-mode t))
 
 (use-package magit
-  :defer t
-  :after nerd-icons
+  :after (nerd-icons diff-hl)
+  :hook
+  (magit-post-refresh-hook . diff-hl-magit-post-refresh)
+  (magit-post-refresh . diff-hl-magit-post-refresh)
   :custom
   (magit-format-file-function #'magit-format-file-nerd-icons)
   (magit-process-connection-type nil))