Port more settings to use-package

1 files changed, 17 insertions, 2 deletions

diff --git a/.emacs b/.emacs
index 8c98644..68638ce 100644
--- a/.emacs
+++ b/.emacs
@@ -336,8 +336,6 @@
          '(:eval (if (>= text-scale-mode-amount 0) "🗚" "🗛"))
          'face-remap)
 (delight 'visual-line-mode nil t)
-(delight 'which-key-mode nil 'which-key)
-(delight 'whitespace-mode nil 'whitespace)
 (delight 'with-editor-mode "⸎" 'with-editor)
 ;; TODO: Narrow (⌖, ⛶)
 
@@ -763,5 +761,22 @@
   :custom
   (show-paren-mode t)
   (show-paren-predicate t))
+
+(use-package which-key
+  :custom
+  (which-key-idle-delay 0.5)
+  (which-key-mode t)
+  :delight)
+
+(use-package whitespace
+  :config
+  (my/setopt
+   whitespace-style
+   (my/list-update whitespace-style
+     nil '(lines missing-newline-at-eof)))
+  :delight
+   ;; FIXME: without :demand t, enabling whitespace-mode in a diff
+   ;; buffer first causes diff-mode's settings to be applied globally.
+  :demand t)
 
 ;;; TODO: decruftify mode-line (e.g. remove superflous parens).