*Another* cleanup

core/core-evil.el

@@ -59,8 +59,9 @@
     (evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
 
   ;; Switch to normal mode before switching windows
-  (defun narf*evil-back-to-normal () (evil-normal-state))
-  (advice-add 'select-window :before 'narf*evil-back-to-normal)
+  (defun narf|evil-back-to-normal (&rest _)
+    (when (eq evil-state 'insert) (evil-normal-state)))
+  (add-hook! narf.window-switch 'narf|evil-back-to-normal)
 
   (progn ; evil hacks
     (defadvice evil-force-normal-state (after evil-esc-quit activate)

core/core-helm.el

@@ -149,7 +149,5 @@
 (use-package helm-command  :commands helm-M-x)
 (use-package helm-descbinds :commands helm-descbinds)
 
-(use-package helm-deft :defer t)
-
 (provide 'core-helm)
 ;;; core-helm.el ends here

core/core-ui.el

@@ -146,7 +146,7 @@
   :preface
   (defvar narf--hl-nlinum-overlay nil)
   (defvar narf--hl-nlinum-line nil)
-  (defvar nlinum-format " %4d  ")
+  (defvar nlinum-format " %4d ")
   (defface linum-highlight-face '((t (:inherit linum))) "Face for line highlights")
   (setq linum-format "%3d ")
   :init