   (setq-default abbrev-mode t))
 
 (use-package nyan-mode :ensure t
-  :config
-  (when (window-system)
-    (nyan-mode +1)))
+  :if (display-graphic-p)
+  :config
+  (nyan-mode +1))
 
 (use-package fontawesome :ensure t
-  :after ar/font-assert-installed
+  :after ar-font
+  :defer 10
   :config
   (ar/font-assert-installed "FontAwesome" "Install ttf from http://fontawesome.io."))
 

    :config
    (validate-setq helm-net-prefer-curl t))

  (use-package helm-imenu)

  ;; Switch major modes and toggle minor modes.
  (use-package helm-source)

  (use-package helm-mode-manager :ensure t)

  (use-package imenu-anywhere :ensure t)

  (use-package helm-ag :ensure t
    :config
    (cond ((executable-find "rg")
           (validate-setq helm-ag-base-command "rg --vimgrep --no-heading --ignore-case"))
          ((executable-find "pt")

;; (use-package annoying-arrows-mode :ensure t
;;   :config (global-annoying-arrows-mode))

;; COMEBACK
;; Remember point/place for each file.
(use-package saveplace
  :defer 10
  :config
  (setq-default save-place t)
  (validate-setq save-place-file (expand-file-name ".places"
