emacs/dired: use diff-hl instead of dired-k

modules/emacs/dired/config.el

@@ -41,30 +41,15 @@
   :hook (dired-mode . diredfl-mode))
 
 
-(def-package! dired-k
+(def-package! diff-hl
-  :hook (dired-initial-position . dired-k)
+  :defer t
-  :hook (dired-after-readin . dired-k-no-revert)
+  :hook (dired-mode . diff-hl-dired-mode)
+  :init
+  (when (featurep! :tools magit)
+    (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))
   :config
-  (setq dired-k-style 'git
+  ;; use margin instead of fringe
-        dired-k-padding 1)
+  (diff-hl-margin-mode))
-
-  ;; 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."
-    (cl-letf (((symbol-function #'kill-process)
-               (symbol-function #'interrupt-process)))
-      (apply orig-fn args)))
-  (advice-add #'dired-k--start-git-status :around #'+dired*interrupt-process)
-
-  (defun +dired*dired-k-highlight (orig-fn &rest args)
-    "Butt out if the requested directory is remote (i.e. through tramp)."
-    (unless (file-remote-p default-directory)
-      (apply orig-fn args)))
-  (advice-add #'dired-k--highlight :around #'+dired*dired-k-highlight))
 
 
 (def-package! ranger

modules/emacs/dired/packages.el

@@ -2,7 +2,7 @@
 ;;; emacs/dired/packages.el
 
 (package! diredfl)
-(package! dired-k)
+(package! diff-hl)
 (package! dired-rsync)
 (when (featurep! +ranger)
   (package! ranger))