From 3638e4cd74dddd8f608d030f795c0b62eb541643 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat, 5 Aug 2017 11:36:09 +0200
Subject: [PATCH] Assimilate ivy 0.9.1-138-gf9c5149

---
 .gitmodules |  4 ++++
 init.el     | 19 ++++++++++++++++---
 lib/ivy     |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 160000 lib/ivy

diff --git a/.gitmodules b/.gitmodules
index 2919cce..a425f4c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,6 +30,10 @@
 [submodule "git-modes"]
 	path = lib/git-modes
 	url = git@github.com:magit/git-modes.git
+[submodule "ivy"]
+	path = lib/ivy
+	url = git@github.com:abo-abo/swiper.git
+	info-path = doc
 [submodule "magit"]
 	path = lib/magit
 	url = git@github.com:magit/magit.git
diff --git a/init.el b/init.el
index 16ffe3c..6c19b07 100644
--- a/init.el
+++ b/init.el
@@ -56,6 +56,22 @@
 (use-package server
   :config (or (server-running-p) (server-mode)))
 
+(use-package counsel
+  :demand t
+  :bind (("M-x"     . counsel-M-x)
+         ("C-x C-f" . counsel-find-file)
+         ("C-x C-l" . counsel-find-library))
+  :config (counsel-mode))
+
+(use-package ivy
+  :demand t
+  :bind (("C-c C-r" . ivy-resume))
+  :config (ivy-mode))
+
+(use-package swiper
+  :defer t
+  :bind (("C-s" . swiper)))
+
 (progn ;     startup
   (message "Loading early birds...done (%.3fs)"
            (float-time (time-subtract (current-time)
@@ -83,9 +99,6 @@
   :defer t
   :config (temp-buffer-resize-mode))
 
-(progn ;    `isearch'
-  (setq isearch-allow-scroll t))
-
 (use-package lisp-mode
   :config
   (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
diff --git a/lib/ivy b/lib/ivy
new file mode 160000
index 0000000..f9c5149
--- /dev/null
+++ b/lib/ivy
@@ -0,0 +1 @@
+Subproject commit f9c51498d00cba54eca779b3caa2b8ff4a9f6f7d