From 1501dcdf82a068d4c66010931d07e725c76f2531 Mon Sep 17 00:00:00 2001
From: David Florness <edwargix@gmail.com>
Date: Wed, 6 Dec 2017 20:53:34 -0700
Subject: [PATCH] Setup evil and related packages in separate file

---
 init.el            | 39 +-----------------------------
 lisp/setup-evil.el | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 38 deletions(-)
 create mode 100644 lisp/setup-evil.el

diff --git a/init.el b/init.el
index e61674b..262fca0 100644
--- a/init.el
+++ b/init.el
@@ -1,6 +1,7 @@
 
 (add-to-list 'load-path "~/.emacs.d/lisp")
 
+(require 'setup-evil)
 (require 'setup-packages)
 (require 'setup-appearance)
 (require 'setup-dev)
@@ -26,25 +27,6 @@
 		 ("\\.markdown\\'" . markdown-mode))
   :init (setq markdown-command "multimarkdown"))
 
-;;; Evil (extensible vi layer)
-(use-package evil
-  :init
-  (setq evil-want-C-u-scroll t)
-  :ensure t
-  :config
-  (progn
-	(evil-define-key 'motion help-mode-map (kbd "<tab>") 'forward-button)
-	(evil-define-key 'motion help-mode-map (kbd "S-<tab>") 'backward-button)
-	(define-key evil-ex-map "b " 'helm-mini)
-	(define-key evil-ex-map "e " 'helm-find-files)
-	(add-hook 'with-editor-mode-hook 'evil-insert-state)
-	(evil-mode 1)))
-(use-package evil-surround
-  :ensure t
-  :after evil
-  :config
-  (progn
-	(global-evil-surround-mode 1)))
 
 ;;; Magit: a Git Porcelain inside Emacs
 (use-package magit
@@ -53,11 +35,6 @@
   (("C-x g" . magit-status)
    ("C-x M-g" . magit-dispatch-popup)))
 
-;;; Evil keybindings for magit
-(use-package evil-magit
-  :after evil
-  :ensure t)
-
 ;;; Syntax/error checking for GNU Emacs
 (use-package flycheck
   :ensure t
@@ -123,20 +100,6 @@
   (progn
 	(add-hook 'org-mode-hook 'org-bullets-mode)))
 
-;;; Evil keybindings for org
-(use-package evil-org
-  :init
-  (progn
-	(add-hook 'org-mode-hook 'evil-org-mode)
-	(add-hook 'evil-org-mode-hook
-			  (lambda ()
-				(evil-org-set-key-theme)
-				(evil-define-key 'normal
-				  evil-org-mode-map
-				  (kbd "<return>")
-				  'evil-org-return))))
-  :ensure t
-  :after org)
 
 ;;; Paradox: a modern package menu
 (use-package paradox
diff --git a/lisp/setup-evil.el b/lisp/setup-evil.el
new file mode 100644
index 0000000..18a0966
--- /dev/null
+++ b/lisp/setup-evil.el
@@ -0,0 +1,59 @@
+;;; setup-evil --- Setup evil
+
+;;; Commentary:
+
+;; Setup evil mode to my liking
+
+;;; Code:
+
+
+;;; Evil (extensible vi layer)
+(use-package evil
+  :ensure t
+  :init
+  (progn
+	(setq evil-want-C-u-scroll t))
+  :config
+  (progn
+	(require 'evil)
+	(evil-define-key 'motion help-mode-map (kbd "<tab>") 'forward-button)
+	(evil-define-key 'motion help-mode-map (kbd "S-<tab>") 'backward-button)
+	(define-key evil-ex-map "b " 'helm-mini)
+	(define-key evil-ex-map "e " 'helm-find-files)
+	(add-hook 'with-editor-mode-hook 'evil-insert-state)
+	(evil-mode 1)))
+
+
+;;; Easily surround text
+(use-package evil-surround
+  :ensure t
+  :after evil
+  :config
+  (progn
+	(global-evil-surround-mode 1)))
+
+
+;;; Evil keybindings for magit
+(use-package evil-magit
+  :after evil
+  :ensure t)
+
+
+;;; Evil keybindings for org
+(use-package evil-org
+  :init
+  (progn
+	(add-hook 'org-mode-hook 'evil-org-mode)
+	(add-hook 'evil-org-mode-hook
+			  (lambda ()
+				(evil-org-set-key-theme)
+				(evil-define-key 'normal
+				  evil-org-mode-map
+				  (kbd "<return>")
+				  'evil-org-return))))
+  :ensure t
+  :after org)
+
+
+(provide 'setup-evil)
+;;; setup-evil.el ends here
-- 
2.38.4