Updating Doom Emacs.

.emacs.d/modules/ui/neotree/autoload.el

@@ -39,10 +39,9 @@
   "Collapse an expanded directory node or go to the parent node."
   (interactive)
   (when-let (node (neo-buffer--get-filename-current-line))
-    (if (file-directory-p node)
-        (if (neo-buffer--expanded-node-p node)
-            (+neotree/collapse)
-          (neotree-select-up-node))
+    (if (and (file-directory-p node)
+             (neo-buffer--expanded-node-p node))
+        (+neotree/collapse)
       (neotree-select-up-node))))
 
 ;;;###autoload

.emacs.d/modules/ui/neotree/config.el

@@ -8,12 +8,12 @@
              neotree-find
              neo-global--with-buffer
              neo-global--window-exists-p)
-  :config
+  :init
   (setq neo-create-file-auto-open nil
         neo-auto-indent-point nil
         neo-autorefresh nil
         neo-mode-line-type 'none
-        neo-window-width 24
+        neo-window-width 30
         neo-show-updir-line nil
         neo-theme 'icons
         neo-banner-message nil
@@ -35,6 +35,7 @@
           "~$"
           "^#.*#$"))
 
+  :config
   (set-popup-rule! "^ ?\\*NeoTree" :ignore t)
 
   (after! winner
@@ -54,28 +55,19 @@
     (skip-chars-forward " \t\r"))
 
   (map! :map neotree-mode-map
-        :n "g"      nil
-        :n "TAB"    #'neotree-quick-look
-        :n "RET"    #'neotree-enter
-        :n [tab]    #'neotree-quick-look
-        :n [return] #'neotree-enter
-        :n "DEL"    #'evil-window-prev
-        :n "c"      #'neotree-create-node
-        :n "r"      #'neotree-rename-node
-        :n "d"      #'neotree-delete-node
-        :n "j"      #'neotree-next-line
-        :n "k"      #'neotree-previous-line
-        :n "n"      #'neotree-next-line
-        :n "p"      #'neotree-previous-line
-        :n "h"      #'+neotree/collapse-or-up
-        :n "l"      #'+neotree/expand-or-open
-        :n "J"      #'neotree-select-next-sibling-node
-        :n "K"      #'neotree-select-previous-sibling-node
-        :n "H"      #'neotree-select-up-node
-        :n "L"      #'neotree-select-down-node
-        :n "G"      #'evil-goto-line
-        :n "gg"     #'evil-goto-first-line
-        :n "v"      #'neotree-enter-vertical-split
-        :n "s"      #'neotree-enter-horizontal-split
-        :n "q"      #'neotree-hide
-        :n "R"      #'neotree-refresh))
+        :n [tab] (neotree-make-executor
+                  :dir-fn  #'neo-open-dir
+                  :file-fn #'neotree-quick-look)
+        :n "DEL" #'evil-window-prev
+        :n "n"   #'neotree-next-line
+        :n "p"   #'neotree-previous-line
+        :m "h"   #'+neotree/collapse-or-up
+        :m "l"   #'+neotree/expand-or-open
+        :n "J"   #'neotree-select-next-sibling-node
+        :n "K"   #'neotree-select-previous-sibling-node
+        :n "H"   #'neotree-select-up-node
+        :n "L"   #'neotree-select-down-node
+        :n "G"   #'evil-goto-line
+        :n "gg"  #'evil-goto-first-line
+        :n "v"   (neotree-make-executor :file-fn 'neo-open-file-vertical-split)
+        :n "s"   (neotree-make-executor :file-fn 'neo-open-file-horizontal-split)))

.emacs.d/modules/ui/neotree/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/neotree/packages.el
 
-(package! neotree)
+(package! neotree :pin "5e1271655170f4cdc6849258e383c548a4e6e3d0")