   :after evil
   :config
   (global-set-key (kbd "M-/") 'evilnc-comment-or-uncomment-lines))
+
+;; Make sure some modes start in Emacs state
+(dolist (mode '(custom-mode
+                eshell-mode
+                term-mode))
+  (add-to-list 'evil-emacs-state-modes mode))
 
 ;;;;;; Selection
 

(use-package savehist
  :init
  (savehist-mode))

;;;;;; Style Settings


(add-hook 'text-mode-hook 'ws-butler-mode)
(add-hook 'prog-mode-hook 'ws-butler-mode)

(customize-set-variable 'show-trailing-whitespace t)

;;;;;; EditorConfig
(use-package editorconfig
  :after ws-butler
