summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--evil-collection.el5
-rw-r--r--evil-ivy.el69
2 files changed, 73 insertions, 1 deletions
diff --git a/evil-collection.el b/evil-collection.el
index aa09e7c..4b21257 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -66,7 +66,10 @@
(evil-flycheck-set-keys))
(with-eval-after-load 'ggtags
(require 'evil-ggtags)
- (evil-ggtags-set-keys)))
+ (evil-ggtags-set-keys))
+ (with-eval-after-load 'ivy
+ (require 'evil-ivy)
+ (evil-ivy-set-keys)))
;;;###autoload
(defun evil-collection-all-modes-init ()
diff --git a/evil-ivy.el b/evil-ivy.el
new file mode 100644
index 0000000..7677d18
--- /dev/null
+++ b/evil-ivy.el
@@ -0,0 +1,69 @@
+;;; evil-ivy.el --- Evil integration for ivy. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017 James Nguyen
+
+;; Author: James Nguyen <james@jojojames.com>
+;; Maintainer: James Nguyen <james@jojojames.com>
+;; URL: https://github.com/jojojames/evil-collection
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: evil, emacs, ivy
+;; HomePage: https://github.com/jojojames/evil-collection
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;; Evil integration for `ivy-mode'.
+
+;;; Code:
+(require 'evil)
+(require 'ivy)
+
+(defun evil-ivy-set-keys ()
+ (evil-define-key 'normal ivy-occur-mode-map
+ [mouse-1] 'ivy-occur-click
+ (kbd "RET") 'ivy-occur-press-and-switch
+ (kbd "j") 'ivy-occur-next-line
+ (kbd "k") 'ivy-occur-previous-line
+ (kbd "h") 'evil-backward-char
+ (kbd "l") 'evil-forward-char
+ (kbd "g") nil
+ (kbd "gg") 'evil-goto-first-line
+ (kbd "gf") 'ivy-occur-press
+ (kbd "gr") 'ivy-occur-revert-buffer
+ (kbd "ga") 'ivy-occur-read-action
+ (kbd "go") 'ivy-occur-dispatch
+ (kbd "gc") 'ivy-occur-toggle-calling
+ (kbd "q") 'quit-window)
+
+ (evil-define-key 'normal ivy-occur-grep-mode-map
+ "\C-x\C-q" 'ivy-wgrep-change-to-wgrep-mode
+ "gd" 'ivy-occur-delete-candidate
+ [mouse-1] 'ivy-occur-click
+ (kbd "RET") 'ivy-occur-press-and-switch
+ (kbd "j") 'ivy-occur-next-line
+ (kbd "k") 'ivy-occur-previous-line
+ (kbd "h") 'evil-backward-char
+ (kbd "l") 'evil-forward-char
+ (kbd "g") nil
+ (kbd "gg") 'evil-goto-first-line
+ (kbd "gf") 'ivy-occur-press
+ (kbd "gr") 'ivy-occur-revert-buffer
+ (kbd "ga") 'ivy-occur-read-action
+ (kbd "go") 'ivy-occur-dispatch
+ (kbd "gc") 'ivy-occur-toggle-calling
+ (kbd "q") 'quit-window))
+
+(provide 'evil-ivy)
+;;; evil-ivy.el ends here