From 3420ffde7153fd17697e6bf3929c5a5b08dc9f59 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Mon, 6 May 2013 20:59:13 -0400
Subject: [PATCH] Remove key-chord mode !! Not needed anymore (great news).

---
 init-package/init-evil.el      |  5 +++--
 init-package/init-key-chord.el |  2 --
 init.el                        |  1 -
 my-keybindings.el              | 11 ++++++++---
 my-keychords.el                |  7 -------
 packages.el                    |  1 -
 6 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 init-package/init-key-chord.el
 delete mode 100644 my-keychords.el

diff --git a/init-package/init-evil.el b/init-package/init-evil.el
index 4f843fe84..e04b90839 100644
--- a/init-package/init-evil.el
+++ b/init-package/init-evil.el
@@ -6,7 +6,8 @@
 (setq evil-insert-state-cursor '("green3" box))
 (setq evil-motion-state-cursor '("purple" box))
 
-;; from https://github.com/roman/emacs.d/blob/master/zoo/zoo-evil.el
+;; inspired from:
+;; https://github.com/roman/emacs.d/blob/master/zoo/zoo-evil.el
 (evil-define-command fd-to-normal-mode ()
   "Allows to get into 'normal' mode using 'fd'."
   :repeat change
@@ -22,7 +23,7 @@
           ;; remove the f character
           (delete-char -1)
           (set-buffer-modified-p modified)
-          (push 'escape unread-command-events))
+          (evil-normal-state))
        (t ; otherwise
           (setq unread-command-events (append unread-command-events
                                               (list evt))))))))
diff --git a/init-package/init-key-chord.el b/init-package/init-key-chord.el
deleted file mode 100644
index 98561456f..000000000
--- a/init-package/init-key-chord.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(key-chord-mode 1)
-(setq key-chord-two-keys-delay 0.05)
diff --git a/init.el b/init.el
index 78a4e66ac..23a1c8913 100644
--- a/init.el
+++ b/init.el
@@ -48,5 +48,4 @@
 (require 'packages)
 (require 'post-extensions)
 (require 'my-keybindings)
-(require 'my-keychords)
 
diff --git a/my-keybindings.el b/my-keybindings.el
index 2e6025113..3b7ca05c8 100644
--- a/my-keybindings.el
+++ b/my-keybindings.el
@@ -1,13 +1,15 @@
 ;; Regular shortcuts ==========================================================
 
 ;; evil -----------------------------------------------------------------------
+;; returns to normal mode
+(define-key evil-insert-state-map "f" #'fd-to-normal-mode)
+(define-key evil-visual-state-map "f" #'fd-to-normal-mode)
+(define-key evil-emacs-state-map  "f" #'fd-to-normal-mode)
+(define-key evil-motion-state-map "f" #'fd-to-normal-mode)
 ;;Make evil-mode up/down operate in screen lines instead of logical lines
 (define-key evil-normal-state-map (kbd "j") 'evil-next-visual-line)
 (define-key evil-normal-state-map (kbd "k") 'evil-previous-visual-line)
 (define-key evil-insert-state-map (kbd "ESC") 'evil-normal-state)
-;; insert blank lines ---------------------------------------------------------
-(define-key evil-normal-state-map (kbd "M-j") 'evil-insert-line-below)
-(define-key evil-normal-state-map (kbd "M-k") 'evil-insert-line-above)
 ;; close parens ---------------------------------------------------------------
 (global-set-key (kbd ")") 'close-open-paren)
 ;; mu4e -----------------------------------------------------------------------
@@ -67,6 +69,9 @@
 (evil-leader/set-key "hh" 'auto-highlight-symbol-mode)
 (evil-leader/set-key "hn" 'ahs-forward)
 (evil-leader/set-key "hp" 'ahs-backward)
+;; insert stuff ---------------------------------------------------------------
+(evil-leader/set-key "ij" 'evil-insert-line-below)
+(evil-leader/set-key "ik" 'evil-insert-line-above)
 ;; jump -----------------------------------------------------------------------
 (evil-leader/set-key "jk" 'evil-join)
 (evil-leader/set-key "jj" 'paredit-newline)
diff --git a/my-keychords.el b/my-keychords.el
deleted file mode 100644
index 29cd5f28f..000000000
--- a/my-keychords.el
+++ /dev/null
@@ -1,7 +0,0 @@
-;; evil -----------------------------------------------------------------------
-(key-chord-define evil-insert-state-map "fd" 'evil-normal-state)
-(key-chord-define evil-visual-state-map "fd" 'evil-normal-state)
-(key-chord-define evil-emacs-state-map  "fd" 'evil-normal-state)
-(key-chord-define evil-motion-state-map "fd" 'evil-normal-state)
-
-(provide 'my-keychords)
diff --git a/packages.el b/packages.el
index 4014474fd..96f9f78c1 100644
--- a/packages.el
+++ b/packages.el
@@ -46,7 +46,6 @@
     htmlize
     jedi
     json-mode
-    key-chord
     less-css-mode
     magit
     markdown-mode