more ivy, less ido

lisp/init-ido.el

@@ -1,6 +1,6 @@
 ;; Use C-f during file selection to switch to regular find-file
 (require 'flx-ido)
-(ido-mode t)  ; use 'buffer rather than t to use only buffer switching
+(ido-mode 'file)  ; use 'buffer rather than t to use only buffer switching
 (flx-ido-mode 1)
 ;; disable ido faces to see flx highlights.
 (setq ido-enable-flex-matching t)

lisp/init-ivy.el

@@ -1,3 +1,8 @@
+(ivy-mode 1)
+(setq ivy-use-virtual-buffers t)
+(global-set-key (kbd "C-c C-r") 'ivy-resume)
+(define-key read-expression-map (kbd "C-r") 'counsel-expression-history)
+
 ;; {{ @see http://oremacs.com/2015/04/19/git-grep-ivy/
 (defun counsel-escape (keyword)
   (setq keyword (replace-regexp-in-string "\"" "\\\\\"" keyword))