From 291b309522d411c4dcea202a05705dc111d8c60b Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 26 Jul 2016 03:19:28 +0200 Subject: [PATCH] Remove ido, replace with ivy and counsel --- emacs/.emacs.d/init.el | 46 +++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index a2df5e7..537e430 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -189,43 +189,29 @@ This is currently the data directory under the (concat user-emacs-directory "vendor-lisp/eternal-theme")) (load-theme 'eternal :no-confirm) -;;;; Ido: +;;;; Ivy: -;; Enable ido. +;;; Ivy is a completing read implementation that offers choises +;;; vertically. -(require 'ido) +(ensure-library ivy) +(require 'ivy) -(ido-mode) -(ido-everywhere) +;; Use fuzzy matching in Ivy. +(with-eval-after-load 'ivy + (setq ivy-re-builders-alist '((t . ivy--regex-fuzzy)) + ivy-initial-inputs-alist nil)) -;; Add smex, an ido-like M-x alternative. +(ivy-mode) -(ensure-library smex) +;;;; Counsel: -(with-eval-after-load 'smex - (setq smex-save-file (oni:data-location "smex-items"))) +;;; Counsel is a group of functions that use Ivy to specialize on +;;; certain built-in commands, such as M-x. -(global-set-key (kbd "M-x") 'smex) -(global-set-key (kbd "M-X") 'smex-major-mode-commands) - -;; Add ido-ubiquitous, use ido (almost) everywhere. - -(ensure-library ido-ubiquitous) -(require 'ido-ubiquitous) -(ido-ubiquitous-mode) - -;; Add ido-flx for flex matching in ido. - -(ensure-library flx-ido) -(require 'flx-ido) - -;; Enable flex matching and disable faces so `flx-ido-mode' can do its -;; thing. -(with-eval-after-load 'ido - (setq ido-enable-flex-matching t - ido-use-faces nil)) - -(flx-ido-mode) +(ensure-library counsel) +(require 'counsel) +(counsel-mode) ;;;; Minor modes: