3 files changed, 9 insertions, 14 deletions
diff --git a/.config/emacs/modules/mm-completion.el b/.config/emacs/modules/mm-completion.el
index 9ea7746..bc7b297 100644
--- a/.config/emacs/modules/mm-completion.el
+++ b/.config/emacs/modules/mm-completion.el
@@ -5,23 +5,21 @@
 
 (use-package vertico
   :ensure t
+  :hook after-init
   :custom
   (vertico-cycle t)
-  :init
-  (vertico-mode)
   :config
-  ;; Highlight the current line
   (require 'hl-line))
 
 
 ;;; Annotate Completions
 
+;; TODO: Show git branch descriptions!
 (use-package marginalia
   :ensure t
+  :hook after-init
   :custom
-  (marginalia-field-width 50)
-  :init
-  (marginalia-mode))
+  (marginalia-field-width 50))
 
 
 ;;; Orderless Completion Style
@@ -52,7 +50,6 @@
 ;;; Save Minibuffer History
 
 (use-package savehist-mode
-  :init
-  (savehist-mode))
+  :hook (after-init . savehist-mode))
 
 (provide 'mm-completion)
diff --git a/.config/emacs/modules/mm-editing.el b/.config/emacs/modules/mm-editing.el
index d9cc99e..43ca211 100644
--- a/.config/emacs/modules/mm-editing.el
+++ b/.config/emacs/modules/mm-editing.el
@@ -3,8 +3,7 @@
 ;;; Delete Region When Typing
 
 (use-package delsel
-  :init
-  (delete-selection-mode))
+  :hook (after-init . delete-selection-mode))
 
 
 ;;; Force Spaces For Alignment
diff --git a/.config/emacs/modules/mm-theme.el b/.config/emacs/modules/mm-theme.el
index 8aa82cd..c49c13f 100644
--- a/.config/emacs/modules/mm-theme.el
+++ b/.config/emacs/modules/mm-theme.el
@@ -181,16 +181,15 @@ See also the `mm-theme-background-opacity' variable."
 
 (use-package spacious-padding
   :ensure t
-  :demand t
-  :config
-  (spacious-padding-mode))
+  :if (display-graphic-p)
+  :hook after-init)
 
 
 ;;; Pretty Page Boundaries
 
 (use-package page-break-lines
   :ensure t
-  :demand t
+  :hook (after-init . global-page-break-lines-mode)
   :init
   (add-hook
    'change-major-mode-hook