@@ -2323,7 +2323,8 @@ I’m quite used to deleting text by selecting it and typing.  Emacs has
 a mode for that.
 
 #+BEGIN_SRC emacs-lisp
-(delete-selection-mode t)
+(use-package delsel
+  :config (delete-selection-mode t))
 #+END_SRC
 
 Sub-word movement is really nice for camel- and Pascal-case
@@ -2582,11 +2583,11 @@ * End
 
 Start a server if possible.  A daemon is already a server.
 #+BEGIN_SRC emacs-lisp
-(run-with-idle-timer 2 nil (lambda ()
-                             (unless (daemonp)
-                               (require 'server)
-                               (unless (server-running-p server-name)
-                                 (server-start)))))
+(use-package server
+  :defer 2
+  :if (not (or (daemonp)
+               (server-running-p server-name)))
+  :config (server-start))
 (setq gc-cons-threshold 800000
       file-name-handler-alist file-name-handler-alist-backup)
 #+END_SRC