2 files changed, 40 insertions, 27 deletions
diff --git a/init.org b/init.org
index a64c378..d6c3fa6 100644
--- a/init.org
+++ b/init.org
@@ -480,6 +480,45 @@ The default prompt face makes it hard to see the prompt.
 (global-set-key (kbd "C-c m") 'magit-status)
 #+END_SRC
 
+* Ido
+:PROPERTIES:
+:noweb-ref: ido
+:END:
+
+#+BEGIN_SRC elisp
+(require 'ido-vertical-mode)
+(ido-mode 1)
+(ido-vertical-mode 1)
+(setq ido-vertical-define-keys 'C-n-and-C-p-only)
+(setq ido-ubiquitous-max-items 50000)
+;; hit ~ to go straight to the home directory in ido mode
+(add-hook 'ido-setup-hook
+          (lambda ()
+            ;; Go straight home
+            (define-key ido-file-completion-map
+              (kbd "~")
+              (lambda ()
+                (interactive)
+                (if (looking-back "/")
+                    (insert "~/")
+                  (call-interactively 'self-insert-command))))))
+
+;; Use ido everywhere
+(require 'ido-ubiquitous)
+(ido-ubiquitous-mode 1)
+(fset 'yes-or-no-p 'y-or-n-p)
+
+;; open file at point with C-x C-f
+(setq ido-use-filename-at-point 'guess)
+#+END_SRC
+
+#+BEGIN_SRC elisp :noweb-ref ido-lazy
+(with-eval-after-load "ido"
+  <<ido>>
+  )
+(require 'ido)
+#+END_SRC
+
 * TODO Initial stuff
 :PROPERTIES:
 :noweb-ref: initial
@@ -639,7 +678,6 @@ still need to process all of this and clean it up.
 
 (load "email.el")
 (require 'my/init-org)
-(load "init-ido.el")
 (load "init-completion.el")
 (load "init-geiser.el")
 (load "init-gnus.el")
@@ -719,6 +757,7 @@ put them all together to build the init file
 <<default-fonts>>
 <<tramp>>
 <<shell>>
+<<ido-lazy>>
 <<initial-after-packages>>
 <<org-mode-lazy>>
 <<magit-lazy>>
diff --git a/lisp/init-ido.el b/lisp/init-ido.el
deleted file mode 100644
index 5cbf566..0000000
--- a/lisp/init-ido.el
+++ /dev/null
@@ -1,26 +0,0 @@
-;; ido mode
-(require 'ido)
-(require 'ido-vertical-mode)
-(ido-mode 1)
-(ido-vertical-mode 1)
-(setq ido-vertical-define-keys 'C-n-and-C-p-only)
-(setq ido-ubiquitous-max-items 50000)
-;; hit ~ to go straight to the home directory in ido mode
-(add-hook 'ido-setup-hook
-          (lambda ()
-            ;; Go straight home
-            (define-key ido-file-completion-map
-              (kbd "~")
-              (lambda ()
-                (interactive)
-                (if (looking-back "/")
-                    (insert "~/")
-                  (call-interactively 'self-insert-command))))))
-
-;; Use ido everywhere
-(require 'ido-ubiquitous)
-(ido-ubiquitous-mode 1)
-(fset 'yes-or-no-p 'y-or-n-p)
-
-;; open file at point with C-x C-f
-(setq ido-use-filename-at-point 'guess)