From 57697efb626b49ec46bc552664e76ef764fbf439 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 20 May 2019 16:04:01 -0400
Subject: [PATCH] emacs/dired: add diredfl & refactor

- Adds C-c C-e for invoking wdired
- Adds diredfl for more colors in dired (and disables dired-k's coloring
  based on mtime, which was confusing)
---
 modules/emacs/dired/config.el   | 21 +++++++++++++++++----
 modules/emacs/dired/packages.el |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el
index 990585a26..2c7dcf0c1 100644
--- a/modules/emacs/dired/config.el
+++ b/modules/emacs/dired/config.el
@@ -7,8 +7,6 @@
         dired-recursive-copies  'always
         dired-recursive-deletes 'top
         ;; Auto refresh dired, but be quiet about it
-        global-auto-revert-non-file-buffers t
-        auto-revert-verbose nil
         dired-hide-details-hide-symlink-targets nil
         ;; files
         image-dired-dir (concat doom-cache-dir "image-dired/")
@@ -28,8 +26,16 @@
         (setq args (delete "--group-directories-first" args))))
     (setq dired-listing-switches (string-join args " ")))
 
-  ;; Kill buffer when quitting dired buffers
-  (define-key dired-mode-map [remap quit-window] (λ! (quit-window t))))
+  (define-key! dired-mode-map
+    ;; Kill buffer when quitting dired buffers
+    [remap quit-window] (λ! (quit-window t))
+    ;; To be consistent with ivy/helm+wgrep integration
+    "C-c C-e" #'wdired-change-to-wdired-mode))
+
+
+(def-package! diredfl
+  :unless (featurep! +ranger)
+  :hook (dired-mode . diredfl-mode))
 
 
 (def-package! dired-k
@@ -37,6 +43,13 @@
   :hook (dired-initial-position . dired-k)
   :hook (dired-after-readin . dired-k-no-revert)
   :config
+  (setq dired-k-style 'git
+        dired-k-padding 1)
+
+  ;; Don't highlight based on mtime, this interferes with diredfl and is more
+  ;; confusing than helpful.
+  (advice-add #'dired-k--highlight-by-file-attribyte :override #'ignore)
+
   (defun +dired*interrupt-process (orig-fn &rest args)
     "Fixes dired-k killing git processes too abruptly, leaving behind disruptive
 .git/index.lock files."
diff --git a/modules/emacs/dired/packages.el b/modules/emacs/dired/packages.el
index 9bc49ca9a..2f9fe04be 100644
--- a/modules/emacs/dired/packages.el
+++ b/modules/emacs/dired/packages.el
@@ -1,6 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; emacs/dired/packages.el
 
+(package! diredfl)
 (package! dired-k)
 (when (featurep! +ranger)
   (package! ranger))