1 files changed, 39 insertions, 33 deletions
diff --git a/lisp/init-ido.el b/lisp/init-ido.el
index 03faddb..28f584f 100644
--- a/lisp/init-ido.el
+++ b/lisp/init-ido.el
@@ -1,37 +1,43 @@
-;; install packages
-(require-packages
- '(flx-ido ido-vertical-mode ido-ubiquitous smex))
-
-;; load ido
-(require 'ido)
-(ido-mode 1)
-(setq ido-enable-prefix nil
-      ido-enable-flex-matching t
-      ido-case-fold nil
-      ido-auto-merge-work-directories-length -1
-      ido-create-new-buffer 'always
-      ido-use-filename-at-point nil
-      ido-max-prospects 10)
-
-;; load flx-ido
-(require 'flx-ido)
-(flx-ido-mode 1)
-;; disable ido faces to see flx highlights.
-(setq ido-use-faces nil)
-
-;; vertical mode for ido
-(require 'ido-vertical-mode)
-(ido-vertical-mode 1)
-(setq ido-vertical-show-count t)
-
-;; load ido-ubiquitous (a better ido-everywhere)
-(require 'ido-ubiquitous)
-(ido-ubiquitous-mode 1)
+;; ido
+(use-package ido
+  :init
+  (setq ido-enable-prefix nil
+        ido-enable-flex-matching t
+        ido-case-fold nil
+        ido-auto-merge-work-directories-length -1
+        ido-create-new-buffer 'always
+        ido-use-filename-at-point nil
+        ido-max-prospects 10)
+
+  :config
+  (ido-mode 1))
+
+;; flx-ido
+(use-package flx-ido
+  :init
+  ;; disable ido faces to see flx highlights.
+  (setq ido-use-faces nil)
+
+  :config
+  (flx-ido-mode 1))
+
+;; ido-vertical-mode
+(use-package ido-vertical-mode
+  :init
+  (setq ido-vertical-show-count t)
+
+  :config
+  (ido-vertical-mode 1))
+
+;; ido-ubiquitous
+(use-package ido-ubiquitous
+  :config
+  (ido-ubiquitous-mode 1))
 
 ;; smex
-(require 'smex)
-(global-set-key (kbd "M-x") 'smex)
-(global-set-key (kbd "M-X") 'smex-major-mode-commands)
-(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)
+(use-package smex
+  :bind (("M-x" . smex)
+         ("M-X" . smex-major-mode-commands)
+         ("C-c C-c M-x" . execute-extended-command)))
 
 (provide 'init-ido)