   (setq avy-all-windows 'all-frames))
 
 (use-package evil
-  :init
-  (add-hook 'prog-mode-hook #'evil-mode)
-  (add-hook 'text-mode-hook #'evil-mode)
+  :hook (( prog-mode text-mode ) . evil-mode )
+  :init
   ;; make cut/paste more vim-like
   ;; mainly keep emacs cut/paste separate from system clipboard
   ;; in the default case (must use "+ or "* to override)

  (evil-mode 1))

(use-package ws-butler
  :init
  (add-hook 'prog-mode-hook #'ws-butler-mode)
  (add-hook 'text-mode-hook #'ws-butler-mode)
  :config
  (setq ws-butler-convert-leading-tabs-or-spaces t)       ; convert according to indent-tabs-mode (but not when smart-tabs-mode on)
  :diminish ws-butler-mode "△")


;; built-in autorevert package
(use-package autorevert
  :hook (( prog-mode text-mode ) . auto-revert-mode )
  :ensure nil
  :defer 2
  :config
  (setq auto-revert-check-vc-info nil                         ; don't update branch on auto-revert
        auto-revert-verbose nil)                              ; don't tell me about auto reverts
