Reorganise evil-* packages

.emacs

@@ -27,7 +27,7 @@
  '(mouse-wheel-scroll-amount (quote (2 ((shift) . 1) ((control)))))
  '(package-selected-packages
    (quote
-    (ess flycheck powerline evil-escape evil-collection evil-org spacemacs-theme doom-modeline magit expand-region doom-themes slime-company slime origami evil-commentary company autopair evil-surround use-package helm evil-leader which-key evil)))
+    (0blayout diminish ess flycheck powerline evil-escape evil-collection evil-org spacemacs-theme doom-modeline magit expand-region doom-themes slime-company slime origami evil-commentary company autopair evil-surround use-package helm evil-leader which-key evil)))
  '(standard-indent 2)
  '(which-key-allow-evil-operators t))
 
@@ -122,45 +122,6 @@
 ;; ;; Spacemacs theme
 ;; (use-package spacemacs-theme)
 
-;; Evil-org
-(use-package evil-org
-  :after (evil org)
-  :config
-  (add-hook 'org-mode-hook 'evil-org-mode)
-  (add-hook 'evil-org-mode-hook
-            (lambda () (evil-org-set-key-theme)))
-  (require 'evil-org-agenda)
-  (evil-org-agenda-set-keys)
-  (setq-default evil-org-movement-bindings '((up . "d")
-                                             (down . "s")
-                                             (left . "t")
-                                             (right . "r")))
-  )
-
-;; Evil collection
-(use-package evil-collection
-  :after (evil evil-org)
-  ;; :custom (evil-collection-setup-minibuffer t)
-  :config
-  (evil-collection-init)
-  (evil-collection-translate-key nil 'evil-motion-state-map
-    "t" "h"
-    "s" "j"
-    "d" "k"
-    "r" "l"
-    "l" "d"
-    "h" "r"
-    "j" "t")
-  )
-
-;; Evil-escape
-(use-package evil-escape
-  :after evil
-  :config
-  (evil-escape-mode t)
-  (setq-default evil-escape-key-sequence "ii"
-                evil-escape-delay 0.2))
-
 ;; Doom modeline
 (use-package doom-modeline
   :config
@@ -230,6 +191,45 @@
 ;;   :config
 ;;   (global-origami-mode))
 
+;; Evil-org
+(use-package evil-org
+  :after (evil org)
+  :config
+  (add-hook 'org-mode-hook 'evil-org-mode)
+  (add-hook 'evil-org-mode-hook
+            (lambda () (evil-org-set-key-theme)))
+  (require 'evil-org-agenda)
+  (evil-org-agenda-set-keys)
+  (setq-default evil-org-movement-bindings '((up . "d")
+                                             (down . "s")
+                                             (left . "t")
+                                             (right . "r")))
+  )
+
+;; Evil collection
+(use-package evil-collection
+  :after (evil evil-org)
+  ;; :custom (evil-collection-setup-minibuffer t)
+  :config
+  (evil-collection-init)
+  (evil-collection-translate-key nil 'evil-motion-state-map
+    "t" "h"
+    "s" "j"
+    "d" "k"
+    "r" "l"
+    "l" "d"
+    "h" "r"
+    "j" "t")
+  )
+
+;; Evil-escape
+(use-package evil-escape
+  :after evil
+  :config
+  (evil-escape-mode t)
+  (setq-default evil-escape-key-sequence "ii"
+                evil-escape-delay 0.2))
+
 ;; Evil-commentary
 (use-package evil-commentary
     :after evil