From 434d13dd0e8995459bfb81ddb71a83e67920b197 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 1 Feb 2024 23:03:32 +0100
Subject: [PATCH] fix(nativation/dirvish): use fork with fix for issue with
 Emacs 30.x

---
 core/siren-core-package-overrides.el | 4 ++++
 modules/navigation/siren-dirvish.el  | 1 +
 straight/versions/default.el         | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/siren-core-package-overrides.el b/core/siren-core-package-overrides.el
index f874ec5..31887f2 100644
--- a/core/siren-core-package-overrides.el
+++ b/core/siren-core-package-overrides.el
@@ -12,6 +12,10 @@
                 ;; features.
                 (all-the-icons-completion :type git :flavor melpa :host github :repo "iyefrat/all-the-icons-completion"
                                           :fork (:host github :repo "MintSoup/all-the-icons-completion"))
+                ;; Use fork with a fix for latest Emacs 30.x builds.
+                (dirvish :type git :flavor melpa :host github :repo "alexluigit/dirvish"
+                         :fork (:host github :repo "jimeh/dirvish" :branch "emacs-30-fix")
+                         :files (:defaults "extensions/*.el" "dirvish-pkg.el"))
                 ;; Override vertico recipe to fix issues with extensions.
                 (vertico :type git :host github :repo "minad/vertico"
                          :files (:defaults "extensions/*" (:exclude ".git")))))))
diff --git a/modules/navigation/siren-dirvish.el b/modules/navigation/siren-dirvish.el
index 43e2cd5..bebe365 100644
--- a/modules/navigation/siren-dirvish.el
+++ b/modules/navigation/siren-dirvish.el
@@ -24,6 +24,7 @@
   (dirvish-attributes '(subtree-state nerd-icons collapse file-size))
   (dirvish-reuse-session t)
   (dirvish-side-auto-expand t)
+  (dirvish-use-mode-line t)
 
   :general
   (:keymaps 'dirvish-mode-map
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 5d8cf25..5344581 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -35,7 +35,7 @@
  ("diff-hl" . "007c06b094de8e650f52b8ff9cfddf8f81f331d6")
  ("dired-hacks" . "874449d6fc98aee565e1715ec18acec3c1c2cafb")
  ("dired-plus" . "377ec04347b8dd8a91df1a33d820fa862fe0efa8")
- ("dirvish" . "119f9f59a618bb7b476c93e9ab1d7542c5c1df41")
+ ("dirvish" . "600b81d5b8adc8532cb31b72c9cf2fc981c678e9")
  ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922")
  ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c")
  ("doom-modeline" . "e521d32c2d670dc664424857e3fc18a37f0728f6")