From 58b77716c97db79035aa73cd1468be31435f8914 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 9 Jun 2017 00:19:44 +0200
Subject: [PATCH] Move all-the-icons to core-ui

---
 core/core-ui.el                       | 18 +++++++++++++++++-
 modules/ui/doom-dashboard/config.el   |  9 ---------
 modules/ui/doom-dashboard/packages.el |  4 ----
 modules/ui/doom-modeline/config.el    | 11 -----------
 modules/ui/doom-modeline/packages.el  |  1 -
 5 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 modules/ui/doom-dashboard/packages.el

diff --git a/core/core-ui.el b/core/core-ui.el
index 320dea662..ecdb3ec6d 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -1,4 +1,4 @@
-;; core-ui.el -*- lexical-binding: t; -*-
+;;; core-ui.el -*- lexical-binding: t; -*-
 
 (defvar doom-ui-fringe-size '4 "Default fringe width")
 
@@ -143,6 +143,22 @@ mode is detected.")
 ;; Plugins
 ;;
 
+(def-package! all-the-icons
+  :commands (all-the-icons-octicon all-the-icons-faicon all-the-icons-fileicon
+             all-the-icons-wicon all-the-icons-allthe-icon
+             all-the-icons-install-fonts)
+  :init
+  (defun doom*disable-all-the-icons-in-tty (orig-fn &rest args)
+    (when (display-graphic-p)
+      (apply orig-fn args)))
+
+  ;; all-the-icons doesn't work in the terminal, so we "disable" it.
+  (advice-add #'all-the-icons-octicon    :around #'doom*disable-all-the-icons-in-tty)
+  (advice-add #'all-the-icons-faicon     :around #'doom*disable-all-the-icons-in-tty)
+  (advice-add #'all-the-icons-fileicon   :around #'doom*disable-all-the-icons-in-tty)
+  (advice-add #'all-the-icons-wicon      :around #'doom*disable-all-the-icons-in-tty)
+  (advice-add #'all-the-icons-alltheicon :around #'doom*disable-all-the-icons-in-tty))
+
 (def-package! fringe-helper
   :commands fringe-helper-define)
 
diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index 0fd04797d..6f53558fe 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -45,15 +45,6 @@
       (goto-char (previous-button (point))))))
 
 
-(if (display-graphic-p)
-    (require 'all-the-icons)
-  (defalias 'all-the-icons-octicon    #'ignore)
-  (defalias 'all-the-icons-faicon     #'ignore)
-  (defalias 'all-the-icons-fileicon   #'ignore)
-  (defalias 'all-the-icons-wicon      #'ignore)
-  (defalias 'all-the-icons-alltheicon #'ignore))
-
-
 ;;
 (setq doom-fallback-buffer +doom-dashboard-name)
 
diff --git a/modules/ui/doom-dashboard/packages.el b/modules/ui/doom-dashboard/packages.el
deleted file mode 100644
index 005387a12..000000000
--- a/modules/ui/doom-dashboard/packages.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; ui/doom-dashboard/packages.el
-
-(package! all-the-icons)
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index 4f6367529..87af63df9 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -4,17 +4,6 @@
 
 (line-number-mode -1)
 
-;; all-the-icons doesn't work in the terminal, so we "disable" it.
-(unless (display-graphic-p)
-  (defalias 'all-the-icons-octicon    #'ignore)
-  (defalias 'all-the-icons-faicon     #'ignore)
-  (defalias 'all-the-icons-fileicon   #'ignore)
-  (defalias 'all-the-icons-wicon      #'ignore)
-  (defalias 'all-the-icons-alltheicon #'ignore))
-
-(def-package! all-the-icons :demand t
-  :when (display-graphic-p))
-
 (def-package! eldoc-eval :demand t
   :config
   ;; Show eldoc in the mode-line with `eval-expression'
diff --git a/modules/ui/doom-modeline/packages.el b/modules/ui/doom-modeline/packages.el
index f9dbcb769..12cee9971 100644
--- a/modules/ui/doom-modeline/packages.el
+++ b/modules/ui/doom-modeline/packages.el
@@ -13,7 +13,6 @@
 ;;(require 'iedit)
 ;;(require 'evil-multiedit)
 
-(package! all-the-icons)
 (package! eldoc-eval)
 (when (featurep! :feature evil)
   (package! evil-anzu))