From 8e58b77f26552f73de1381fd9e17834374ca4d7a Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Thu, 18 Jan 2018 16:09:52 -0800
Subject: Simplify emacs setup

---
 home/.bash_aliases    |  2 +-
 home/.emacs.d/init.el | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/home/.bash_aliases b/home/.bash_aliases
index 2954ec5..c92db25 100644
--- a/home/.bash_aliases
+++ b/home/.bash_aliases
@@ -1,2 +1,2 @@
-alias ec="emacsclient --alternate-editor='' --create-frame --no-wait"
+alias ec="emacsclient --alternate-editor='' --tty"
 alias g=git
diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index ebd25a0..ae9657a 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -74,22 +74,11 @@
 
 ;;; Specialized packages
 
-(use-package counsel)
-(use-package swiper)
-(use-package ivy
-  :diminish ivy-mode
+(use-package ido
   :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) ")
-  (setq ivy-initial-inputs-alist nil)
-  (setq ivy-re-builders-alist
-	'((t . ivy--regex-plus))))
+  (setq ido-enable-flex-matching t)
+  (setq ido-everywhere t)
+  (ido-mode 1))
 
 (use-package goto-chg
   :commands goto-last-change
@@ -104,14 +93,14 @@
   :init
   (setq projectile-use-git-grep t)
   :config
-  (setq projectile-completion-system 'ivy)
+  (setq projectile-completion-system 'ido)
   (projectile-global-mode t)
   :diminish projectile-mode)
 
 (use-package magit
   :bind ("C-x g" . magit-status)
   :config
-  (setq magit-completing-read-function 'ivy-completing-read))
+  (setq magit-completing-read-function 'magit-ido-completing-read))
 
 (use-package zoom-frm
   :bind (("C-+" . zoom-all-frames-in)
-- 
cgit v1.2.3