Add evil-mode and colemak-evil settings

1 files changed, 18 insertions, 1 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b961ebc..e215816 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -906,6 +906,11 @@ from myaethon2.core.decorators import (
           (topmost-intro-cont first c-lineup-topmost-intro-cont
            c-lineup-gnu-DEFUN-intro-cont))))
 
+(stante-after colemak-evil
+  (define-key evil-insert-state-map (kbd "C-g") #'evil-normal-state)
+  (define-key evil-replace-state-map (kbd "C-g") #'evil-normal-state)
+  (define-key evil-visual-state-map (kbd "C-g") #'evil-normal-state))
+
 (stante-after compile
   (setq compilation-scroll-output t))
 
@@ -987,6 +992,15 @@ from myaethon2.core.decorators import (
   (add-to-list 'eshell-output-filter-functions #'oni:eshell-handle-url)
   (add-to-list 'eshell-output-filter-functions #'eshell-truncate-buffer))
 
+(stante-after evil
+  (evil-set-initial-state 'jabber-roster-mode 'insert)
+  (evil-set-initial-state 'grep-mode 'insert)
+  (evil-set-initial-state 'avandu-overview-mode 'insert)
+  (evil-set-initial-state 'avandu-article-mode 'insert)
+  (evil-set-initial-state 'gnus-summary-mode 'insert)
+  (evil-set-initial-state 'gnus-article-mode 'insert)
+  (evil-set-initial-state 'gnus-group-mode 'insert))
+
 (stante-after eww
   (setq eww-download-path               ; Don't go to ~/Downloads
         "~/downloads/"))
@@ -1369,7 +1383,10 @@ from myaethon2.core.decorators import (
   (yas-global-mode)
 
   (require 'popwin)
-  (popwin-mode))
+  (popwin-mode)
+
+  (evil-mode)
+  (require 'colemak-evil))
 
 (when (equal system-name "drd")
   (load "eap-autoloads"))