From eedbbdd9c1f8447fd3b6bddc7ef31c13d03493fe Mon Sep 17 00:00:00 2001
From: Ting Zhou <zhouting@umich.edu>
Date: Sat, 8 Dec 2018 21:52:24 -0800
Subject: [PATCH] emacs/dired: use all-the-icons font lock fix recipe

---
 core/packages.el                |  4 +++-
 modules/emacs/dired/config.el   | 10 ++--------
 modules/emacs/dired/packages.el |  3 +--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/core/packages.el b/core/packages.el
index c41aeed79..344b0dbec 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -8,7 +8,9 @@
   (package! ns-auto-titlebar))
 
 ;; core-ui.el
-(package! all-the-icons)
+(package! all-the-icons
+  :recipe (:fetcher github :repo "ubolonton/all-the-icons.el"
+           :branch "font-lock-fix" :files (:defaults "data")))
 (package! hide-mode-line)
 (package! highlight-indentation)
 (package! highlight-numbers)
diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el
index 8cc853a4c..1e37c5f70 100644
--- a/modules/emacs/dired/config.el
+++ b/modules/emacs/dired/config.el
@@ -84,12 +84,11 @@
   (add-hook 'dired-mode-hook #'ranger/dired-setup)
 
   (setq ranger-override-dired t)
-  :config
   ;; set up image-dired to allow picture resize
   (setq image-dired-dir (concat doom-cache-dir "image-dir"))
   (unless (file-directory-p image-dired-dir)
     (make-directory image-dired-dir))
-
+  :config
   (setq ranger-omit-regexp "^\.DS_Store$"
         ranger-excluded-extensions '("mkv" "iso" "mp4")
         ranger-deer-show-details nil
@@ -100,12 +99,7 @@
   :when (featurep! +icons)
   :defer t
   :init
-  (when (display-graphic-p)
-    (add-hook! 'dired-mode-hook #'all-the-icons-dired-mode)))
-
-
-(def-package! font-lock+
-  :when (featurep! +icons))
+  (add-hook! 'dired-mode-hook #'all-the-icons-dired-mode))
 
 
 (def-package! dired-x
diff --git a/modules/emacs/dired/packages.el b/modules/emacs/dired/packages.el
index 63afa9aa9..9bc49ca9a 100644
--- a/modules/emacs/dired/packages.el
+++ b/modules/emacs/dired/packages.el
@@ -5,5 +5,4 @@
 (when (featurep! +ranger)
   (package! ranger))
 (when (featurep! +icons)
-  (package! all-the-icons-dired)
-  (package! font-lock+ :recipe (:fetcher github :repo "emacsmirror/font-lock-plus")))
+  (package! all-the-icons-dired))