From 0ea84e17a71a571fb9190a35da1a063ddf6737de Mon Sep 17 00:00:00 2001 From: StrawberryTea Date: Sat, 30 May 2026 15:53:55 -0400 Subject: [PATCH] fix(default): prioritize neotree/treemacs sidebar bindings over dirvish Move the (:when (modulep! :emacs dired +dirvish)) block ahead of the neotree and treemacs blocks for the SPC o sidebar bindings. Since later map! definitions override earlier ones for the same key, placing dirvish first lets the neotree/treemacs 'p'/'P' bindings take precedence when those modules are enabled alongside dirvish. Co-Authored-By: Claude Opus 4.8 (1M context) --- modules/config/default/+emacs-bindings.el | 8 ++++---- modules/config/default/+evil-bindings.el | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index f7d8cad3b55..846392d45bf 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -227,16 +227,16 @@ :desc "REPL" "r" #'+eval/open-repl-other-window :desc "REPL (same window)" "R" #'+eval/open-repl-same-window :desc "Dired" "-" #'dired-jump + (:when (modulep! :emacs dired +dirvish) + :desc "Open directory in dirvish" "/" #'dirvish + :desc "Project sidebar" "p" #'dirvish-side + :desc "Find file in project sidebar" "P" #'+dired/dirvish-side-and-follow) (:when (modulep! :ui neotree) :desc "Project sidebar" "p" #'+neotree/open :desc "Find file in project sidebar" "P" #'+neotree/find-this-file) (:when (modulep! :ui treemacs) :desc "Project sidebar" "p" #'+treemacs/toggle :desc "Find file in project rsidebar" "P" #'treemacs-find-file) - (:when (modulep! :emacs dired +dirvish) - :desc "Open directory in dirvish" "/" #'dirvish - :desc "Project sidebar" "p" #'dirvish-side - :desc "Find file in project sidebar" "P" #'+dired/dirvish-side-and-follow) (:when (modulep! :term shell) :desc "Toggle shell popup" "t" #'+shell/toggle :desc "Open shell here" "T" #'+shell/here) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 8aa8af76ab7..36c36bfcca3 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -689,16 +689,16 @@ :desc "REPL" "r" #'+eval/open-repl-other-window :desc "REPL (same window)" "R" #'+eval/open-repl-same-window :desc "Dired" "-" #'dired-jump + (:when (modulep! :emacs dired +dirvish) + :desc "Open directory in dirvish" "/" #'dirvish + :desc "Project sidebar" "p" #'dirvish-side + :desc "Find file in project sidebar" "P" #'+dired/dirvish-side-and-follow) (:when (modulep! :ui neotree) :desc "Project sidebar" "p" #'+neotree/open :desc "Find file in project sidebar" "P" #'+neotree/find-this-file) (:when (modulep! :ui treemacs) :desc "Project sidebar" "p" #'+treemacs/toggle :desc "Find file in project sidebar" "P" #'treemacs-find-file) - (:when (modulep! :emacs dired +dirvish) - :desc "Open directory in dirvish" "/" #'dirvish - :desc "Project sidebar" "p" #'dirvish-side - :desc "Find file in project sidebar" "P" #'+dired/dirvish-side-and-follow) (:when (modulep! :term shell) :desc "Toggle shell popup" "t" #'+shell/toggle :desc "Open shell here" "T" #'+shell/here)