From c4783b8eec1212aef8d0477cb41d0310a4aefa23 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Mon, 31 Jul 2017 21:25:33 -0700
Subject: Revert "Remove ivy and use ido"

This reverts commit a17323a3d1a83c59260c0b74306c524486bf7b3c.
---
 home/.emacs.d/init.el | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index d55ba61..2c8df49 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -44,12 +44,6 @@
 ;; don't send emacs to background
 (global-unset-key (kbd "C-z"))
 
-(setq browse-url-browser-function 'browse-url-chrome)
-
-(setq ido-enable-flex-matching t
-      ido-everywhere t)
-(ido-mode 1)
-
 ;;(setq initial-buffer-choice "~/readme.org")
 
 (defun show-file-name ()
@@ -77,6 +71,20 @@
 
 ;;; Specialized packages
 
+(use-package counsel)
+(use-package swiper)
+(use-package ivy
+  :diminish ivy-mode
+  :init
+  (ivy-mode 1)
+  :bind (("C-s" . swiper)
+	 ("M-x" . counsel-M-x)
+	 ("C-x C-f" . counsel-find-file)
+	 ("C-c C-r" . ivy-resume))
+  :config
+  (setq ivy-use-virtual-buffers t)
+  (setq ivy-count-format "(%d/%d) "))
+
 (use-package goto-chg
   :commands goto-last-change
   :bind (("C-." . goto-last-change)
@@ -90,11 +98,14 @@
   :init
   (setq projectile-use-git-grep t)
   :config
+  (setq projectile-completion-system 'ivy)
   (projectile-global-mode t)
   :diminish projectile-mode)
 
 (use-package magit
-  :bind ("C-x g" . magit-status))
+  :bind ("C-x g" . magit-status)
+  :config
+  (setq magit-completing-read-function 'ivy-completing-read))
 
 (use-package zoom-frm
   :bind (("C-+" . zoom-all-frames-in)
-- 
cgit v1.2.3