From 99b5d42f3fec88e6952a84105f48a314e3820375 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 20 May 2016 17:22:52 -0400
Subject: [PATCH] neotree: unicode icon display; wider window

---
 core/core-project.el          |  8 ++++++--
 core/defuns/defuns-neotree.el | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/core/core-project.el b/core/core-project.el
index 9d55a9aa6..422cbe1eb 100644
--- a/core/core-project.el
+++ b/core/core-project.el
@@ -85,15 +85,17 @@
         neo-auto-indent-point t
         neo-mode-line-type 'none
         neo-persist-show nil
-        neo-window-width 26
+        neo-window-width 28
         neo-show-updir-line nil
         neo-auto-indent-point t
+        neo-theme 'nerd ; fallback
         neo-banner-message nil)
   :config
   (evil-set-initial-state 'neotree-mode 'motion)
+  (add-hook 'neo-after-create-hook 'narf|hide-mode-line)
 
   ;; A custom and simple theme for neotree
-  (advice-add 'neo-buffer--insert-fold-symbol :override 'narf*neo-buffer-fold-symbol)
+  (advice-add 'neo-buffer--insert-fold-symbol :override 'narf*neo-theme)
   ;; Shorter pwd in neotree
   (advice-add 'neo-buffer--insert-root-entry :filter-args 'narf*neotree-shorten-pwd)
   ;; Don't ask for confirmation when creating files
@@ -103,7 +105,9 @@
 
   (add-hook 'neotree-mode-hook 'narf|neotree-init-keymap)
   (defun narf|neotree-init-keymap ()
+    (setq line-spacing 1)
     (map! :map evil-motion-state-local-map
+          "ESC ESC" 'neotree-hide
           "q"   'neotree-hide
           "RET" 'neotree-enter
           "J"   'neotree-select-next-sibling-node
diff --git a/core/defuns/defuns-neotree.el b/core/defuns/defuns-neotree.el
index abac947d6..19cc86044 100644
--- a/core/defuns/defuns-neotree.el
+++ b/core/defuns/defuns-neotree.el
@@ -33,16 +33,6 @@
                (eq (current-buffer) (neo-global--get-buffer)))
     (neotree-hide)))
 
-;;;###autoload
-(defun narf*neo-buffer-fold-symbol (name)
-  "Custom hybrid ascii theme with leading whitespace."
-  (let ((n-insert-symbol (lambda (n)
-                           (neo-buffer--insert-with-face
-                            n 'neo-expand-btn-face))))
-    (or (and (eq name 'open)  (funcall n-insert-symbol "- "))
-        (and (eq name 'close) (funcall n-insert-symbol "+ "))
-        (and (eq name 'leaf)  (funcall n-insert-symbol "  ")))))
-
 ;;;###autoload
 (defun narf*save-neotree (orig-fun &rest args)
   "Prevents messing up the neotree buffer on window changes"
@@ -57,7 +47,17 @@
 ;;;###autoload
 (defun narf*neotree-shorten-pwd (node)
   "Shorter pwd in neotree"
-  (list (abbreviate-file-name (car node))))
+  (list (concat "  " (projectile-project-name))))
+
+;;;###autoload
+(defun narf*neo-theme (name)
+  "Custom hybrid ascii theme with leading whitespace."
+  (let ((n-insert-symbol (lambda (n)
+                           (neo-buffer--insert-with-face
+                            n 'neo-expand-btn-face))))
+    (or (and (eq name 'open)  (funcall n-insert-symbol " -  "))
+        (and (eq name 'close) (funcall n-insert-symbol " +  "))
+        (and (eq name 'leaf)  (funcall n-insert-symbol "   ")))))
 
 (provide 'defuns-neotree)
 ;;; defuns-neotree.el ends here