From 4e33f79c290706099cc498743e0e3c1ab1d9e210 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 4 Dec 2022 01:57:16 +0000
Subject: [PATCH] chore(spelling/flyspell): move setup to a central list of
 hooks

---
 modules/languages/siren-markdown.el    |  4 +---
 modules/org-mode/siren-org-mode.el     |  2 --
 modules/spelling/siren-flyspell.el     | 10 +++++++++-
 modules/version-control/siren-magit.el |  2 --
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el
index ec81e95..3d3cf13 100644
--- a/modules/languages/siren-markdown.el
+++ b/modules/languages/siren-markdown.el
@@ -8,7 +8,6 @@
 
 (require 'siren-display-fill-column)
 (require 'siren-display-line-numbers)
-(require 'siren-flyspell)
 (require 'siren-move-dup)
 
 (use-package markdown-mode
@@ -48,8 +47,7 @@
 
     (siren-display-fill-column t)
     (siren-display-line-numbers t)
-    (auto-fill-mode t)
-    (flyspell-mode t))
+    (auto-fill-mode t))
 
   (defun siren-markdown-mode-setup-prettier ()
     "Configure prettier-js-args based on auto-fill-column mode."
diff --git a/modules/org-mode/siren-org-mode.el b/modules/org-mode/siren-org-mode.el
index 80f8da8..a8ae82f 100644
--- a/modules/org-mode/siren-org-mode.el
+++ b/modules/org-mode/siren-org-mode.el
@@ -9,7 +9,6 @@
 (require 'siren-display-fill-column)
 (require 'siren-display-indentation)
 (require 'siren-display-line-numbers)
-(require 'siren-flyspell)
 (require 'siren-smart-shift)
 
 (use-package org
@@ -91,7 +90,6 @@
     (siren-display-fill-column t)
     (siren-display-indentation t)
     (siren-display-line-numbers t)
-    (flyspell-mode t)
     (visual-line-mode t)
     (whitespace-mode t))
 
diff --git a/modules/spelling/siren-flyspell.el b/modules/spelling/siren-flyspell.el
index d93d703..7223dfb 100644
--- a/modules/spelling/siren-flyspell.el
+++ b/modules/spelling/siren-flyspell.el
@@ -12,12 +12,20 @@
   :diminish flyspell-mode
 
   :hook
-  (prog-mode . flyspell-prog-mode)
+  (prog-mode . siren-flyspell-prog-mode-enable)
+  ((git-commit-setup text-mode) . siren-flyspell-mode-enable)
 
   :custom
   (ispell-program-name "aspell") ;; use aspell instead of ispell
   (ispell-extra-args '("--lang=en" "--sug-mode=ultra"))
 
+  :preface
+  (defun siren-flyspell-mode-enable ()
+    (flyspell-mode t))
+
+  (defun siren-flyspell-prog-mode-enable ()
+    (flyspell-prog-mode t))
+
   :config
   ;; Unbind keys used by siren-goto-chg module.
   (unbind-key "C-." flyspell-mode-map)
diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el
index fbe62a6..981c249 100644
--- a/modules/version-control/siren-magit.el
+++ b/modules/version-control/siren-magit.el
@@ -8,7 +8,6 @@
 
 (require 'siren-display-fill-column)
 (require 'siren-display-line-numbers)
-(require 'siren-flyspell)
 (require 'siren-whitespace)
 
 (use-package magit
@@ -55,7 +54,6 @@
     (siren-display-fill-column)
     (siren-display-line-numbers)
     (auto-fill-mode t)
-    (flyspell-mode t)
     (whitespace-mode t))
 
   :config