Speed up initialization a little bit

1 files changed, 23 insertions, 23 deletions

diff --git a/lisp/ravi-init-appearance.el b/lisp/ravi-init-appearance.el
index f4407d9..8627a73 100644
--- a/lisp/ravi-init-appearance.el
+++ b/lisp/ravi-init-appearance.el
@@ -73,9 +73,8 @@
   :config
   (progn
     (global-whitespace-mode 1))
-  ; No need for 'ensure: t' since whitespace mode is built in
   :diminish global-whitespace-mode
-  )
+  :defer 3)
 
 (use-package ws-butler
   :config
@@ -96,20 +95,18 @@
 ;; Delete hungrily
 (use-package hungry-delete
   :commands (hungry-delete-forward hungry-delete-backward)
-  :bind (("C-d" . hungry-delete-forward))
-  :init
+  :bind (("C-d" . hungry-delete-forward)
+         ([remap backward-delete-char-untabify] . hungry-delete-backward))
+  :config
   (progn
    (defun jschaf/hungry-delete-backward (n &optional killflag)
-  "Delete non-vertical whitespace backwards on first key press.
+     "Delete non-vertical whitespace backwards on first key press.
 Delete all whitespace on a successive key press."
   (interactive "p\nP")
   (if (eq last-command 'jschaf/hungry-delete-backward)
       (hungry-delete-backward n killflag)
     (let ((hungry-delete-chars-to-skip " \t\f\v"))
-      (hungry-delete-backward n killflag))))
-   ;;(define-key global-map [remap backward-delete-char-untabify] 'jschaf/hungry-delete-backward)
-   (define-key global-map [remap backward-delete-char-untabify] 'hungry-delete-backward)
-   ))
+      (hungry-delete-backward n killflag))))))
 
 ;; Easier compaction of whitespace
 (use-package shrink-whitespace
@@ -122,33 +119,33 @@ Delete all whitespace on a successive key press."
 (use-package subword
   :config
   (global-superword-mode 1)
+  :defer 3
   :diminish superword-mode)
 
 ;; Make word-navigation more palatable
 (use-package syntax-subword
   :init
-  (progn
-    (setq syntax-subword-skip-spaces t))
+  (setq syntax-subword-skip-spaces t)
+  :hook (prog-mode . ravi/turn-on-syntax-subword-mode)
   :config
-  (progn
-    (defun ravi/turn-on-syntax-subword-mode ()
-      (interactive)
-      (syntax-subword-mode 1))
-    (add-hook 'prog-mode-hook 'ravi/turn-on-syntax-subword-mode)))
+  (defun ravi/turn-on-syntax-subword-mode ()
+    (interactive)
+    (syntax-subword-mode 1)))
 
 (use-package rectangle-utils
   :bind (("C-x R" . rectangle-menu)))
 
 ;; Keep cursor away from edges when scrolling up/down
-(use-package smooth-scrolling)
+(use-package smooth-scrolling
+  :defer 5)
 
 ;; Enable automatic indentation, if possible
 (use-package smart-newline
-  :commands (smart-newline)
-  :init
-  (progn
-    (bind-key "<return>" 'smart-newline prog-mode-map)
-    (bind-key "<return>" 'smart-newline emacs-lisp-mode-map)))
+  :bind (:map prog-mode-map
+         ([return] . smart-newline)
+         :map emacs-lisp-mode-map
+         ([return] . smart-newline))
+  :after (:any prog-mode emacs-lisp-mode))
 
 ;; Case toggling: from Oleg Krehel http://oremacs.com/2014/12/25/ode-to-toggle/
 (defun oremacs/char-upcasep (letter)
@@ -257,12 +254,14 @@ Delete all whitespace on a successive key press."
     (global-undo-tree-mode)
     (setq undo-tree-auto-save-history t)
     (setq undo-tree-history-directory-alist
-          `(("." . ,(expand-file-name "undotree/" (ravi/emacs-file "past")))))))
+          `(("." . ,(expand-file-name "undotree/" (ravi/emacs-file "past"))))))
+  :defer 5)
 
 (use-package which-key
   :config
   (progn
     (which-key-mode))
+  :defer 10
   :diminish which-key-mode)
 
 (bind-key "C-h a" 'apropos)
@@ -279,6 +278,7 @@ Delete all whitespace on a successive key press."
                     popwin:display-buffer-action)
                    (reusable-frames . t))))
   :disabled)
+
 (add-to-list 'display-buffer-alist
              `(,(rx bos "*compilation*" eos)
                (display-buffer-reuse-window