From 723f7c3e9590d39dc22823f52191080e2be83e3e Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 23 Dec 2015 03:38:18 -0500
Subject: [PATCH] neotree: reconfigure for shackle compatibility

---
 core/core-project.el | 21 +++++++++------------
 core/core-vars.el    |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/core-project.el b/core/core-project.el
index 848f8b5a4..ab3628889 100644
--- a/core/core-project.el
+++ b/core/core-project.el
@@ -49,22 +49,21 @@
   :functions (neo-buffer--unlock-width neo-buffer--lock-width)
   :init
   (setq neo-create-file-auto-open t
+        neo-auto-indent-point t
         neo-mode-line-type 'none
-        neo-persist-show t
+        neo-persist-show nil
         neo-window-width 22
         neo-show-updir-line nil
         neo-auto-indent-point t
-        neo-banner-message nil
-        ;; requires <https://github.com/jeffplang/emacs-neotree> fork of
-        ;; neotree (at least, until the PR is accepted). Causes neotree to
-        ;; open in a vertical split that consumes the entire height of the
-        ;; frame.
-        neo-modern-sidebar t)
+        neo-banner-message nil)
   :config
+  (evil-set-initial-state 'neotree-mode 'motion)
+  (add-hook! neotree-mode 'narf|neotree-init-keymap)
   (defun narf|neotree-init-keymap ()
     (map! :map evil-motion-state-local-map
           "ESC"  'neotree-hide
-          "\\\\" 'neotree-hide
+          "q"   'neotree-hide
+
           "RET" 'neotree-enter
           "J"   'neotree-select-next-sibling-node
           "K"   'neotree-select-previous-sibling-node
@@ -75,17 +74,15 @@
           "c"   'neotree-create-node
           "d"   'neotree-delete-node
           "g"   'neotree-refresh
-          "q"   'neotree-hide
           "r"   'neotree-rename-node
           "R"   'neotree-change-root))
 
-  (add-hook! neotree-mode 'narf|neotree-init-keymap)
-  (add-hook! window-configuration-change 'narf|neotree-close-on-window-change)
+  ;; (add-hook! window-configuration-change 'narf|neotree-close-on-window-change)
 
-  (evil-set-initial-state 'neotree-mode 'motion)
   (after! projectile
     (setq projectile-switch-project-action 'neotree-projectile-action))
 
+  ;; A custom and simple theme for neotree
   (advice-add 'neo-buffer--insert-fold-symbol :override 'narf*neo-buffer-fold-symbol))
 
 (provide 'core-project)
diff --git a/core/core-vars.el b/core/core-vars.el
index c84960a40..c23844353 100644
--- a/core/core-vars.el
+++ b/core/core-vars.el
@@ -29,7 +29,7 @@ buffer to display.")
                               "*Buffer List*" "*Ibuffer*" "*esh command on file*"
                               "*WoMan-Log*" "*compilation*" "*use-package*"
                               "*quickrun*" "*eclim: problems*" "*Flycheck errors*"
-                              "*popwin-dummy*"
+                              "*popwin-dummy*" " *NeoTree*"
                               ;; Helm
                               "*helm*" "*helm recentf*" "*helm projectile*" "*helm imenu*"
                               "*helm company*" "*helm buffers*" "*Helm Css SCSS*"