26 files changed, 79 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 8c4e859..2588868 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ cache
 elpa
 bookmarks
 vendor
-init/untracked.el
+/lisp/init-untracked.el
 /.mc-lists.el
 /projectile-bookmarks.eld
 /projectile.cache
diff --git a/init.el b/init.el
index 2d6a127..48139cf 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,31 @@
-(server-start)
+(defvar init-lisp-dir (expand-file-name "lisp" user-emacs-directory))
+(add-to-list 'load-path init-lisp-dir)
+
+(require 'init-general)
+(require 'init-pkg)
+(require 'init-keymaps)
 
-(mapc
- (lambda (f) (load-file f))
- (file-expand-wildcards "~/.emacs.d/init/*.el"))
+(require 'init-babel)
+(require 'init-bib)
+(require 'init-dired)
+(require 'init-elisp)
+(require 'init-func)
+(require 'init-git)
+(require 'init-gnus)
+(require 'init-grep)
+(require 'init-haskell)
+(require 'init-ibuffer)
+(require 'init-ido)
+(require 'init-keybindings)
+(require 'init-keychord)
+(require 'init-modes)
+(require 'init-orgcontacts)
+(require 'init-org)
+(require 'init-projectile)
+(require 'init-python)
+(require 'init-smex)
+(require 'init-tex)
+(require 'init-yas)
+(require 'init-untracked)
+
+(server-start)
diff --git a/init/km-babel.el b/lisp/init-babel.el
index 3b71422..561419d 100644
--- a/init/km-babel.el
+++ b/lisp/init-babel.el
@@ -23,3 +23,5 @@
       '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
         "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
         "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
+
+(provide 'init-babel)
diff --git a/init/km-bib.el b/lisp/init-bib.el
index af21480..7d91e93 100644
--- a/init/km-bib.el
+++ b/lisp/init-bib.el
@@ -10,3 +10,5 @@
 
 ;; Used by `bibtex-fill-entry'.
 (setq bibtex-align-at-equal-sign t)
+
+(provide 'init-bib)
diff --git a/init/km-dired.el b/lisp/init-dired.el
index e0011c3..a81f5c3 100644
--- a/init/km-dired.el
+++ b/lisp/init-dired.el
@@ -23,3 +23,5 @@
 (setq-default dired-omit-files-p t)
 
 (setq dired-listing-switches "-alh")
+
+(provide 'init-dired)
diff --git a/init/km-elisp.el b/lisp/init-elisp.el
index 811fd37..511ee4a 100644
--- a/init/km-elisp.el
+++ b/lisp/init-elisp.el
@@ -10,3 +10,5 @@
     (define-key paredit-mode-map (kbd "C-.") 'paredit-forward-barf-sexp)
     (define-key paredit-mode-map (kbd "C-M-,") 'paredit-backward-slurp-sexp)
     (define-key paredit-mode-map (kbd "C-M-.") 'paredit-backward-barf-sexp)))
+
+(provide 'init-elisp)
diff --git a/init/km-func.el b/lisp/init-func.el
index 93f374d..9c87ed1 100644
--- a/init/km-func.el
+++ b/lisp/init-func.el
@@ -232,3 +232,5 @@ Assumes that the frame is only split into two."
         (split-window-horizontally)
       (split-window-vertically))
     (switch-to-buffer nil)))
+
+(provide 'init-func)
diff --git a/init/00-km-general.el b/lisp/init-general.el
index 872eec9..04541b1 100644
--- a/init/00-km-general.el
+++ b/lisp/init-general.el
@@ -90,3 +90,5 @@
 (autoload 'zap-up-to-char "misc"
   "Kill up to, but not including ARGth occurrence of CHAR.")
 (global-set-key (kbd "M-z") 'zap-up-to-char)
+
+(provide 'init-general)
diff --git a/init/km-git.el b/lisp/init-git.el
index e18ab55..2f9316d 100644
--- a/init/km-git.el
+++ b/lisp/init-git.el
@@ -23,3 +23,5 @@ Useful for non-source code repos (e.g., Org mode note files)."
 (setq magit-default-tracking-name-function 'magit-default-tracking-name-branch-only)
 
 (setq magit-log-show-margin nil)
+
+(provide 'init-git)
diff --git a/init/km-gnus.el b/lisp/init-gnus.el
index a9d8a0e..4021d43 100644
--- a/init/km-gnus.el
+++ b/lisp/init-gnus.el
@@ -219,3 +219,5 @@ NO-NUMBER is non-nil, the number of lines is not added."
 (defadvice gnus-group-exit (around gnus-restore-screen activate)
   ad-do-it
   (jump-to-register :gnus-fullscreen))
+
+(provide 'init-gnus)
diff --git a/init/km-grep.el b/lisp/init-grep.el
index f4c3f5a..5a5051e 100644
--- a/init/km-grep.el
+++ b/lisp/init-grep.el
@@ -11,3 +11,5 @@
 (defadvice lgrep (after hide-grep-hxoeader activate) (hide-grep-header))
 (defadvice grep-find (after hide-grep-header activate) (hide-grep-header))
 (defadvice vc-git-grep (after hide-grep-header activate) (hide-grep-header))
+
+(provide 'init-grep)
diff --git a/init/km-haskell.el b/lisp/init-haskell.el
index e687cf3..3be2fe8 100644
--- a/init/km-haskell.el
+++ b/lisp/init-haskell.el
@@ -1 +1,3 @@
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
+
+(provide 'init-haskell)
diff --git a/init/km-ibuffer.el b/lisp/init-ibuffer.el
index ac565ef..9131279 100644
--- a/init/km-ibuffer.el
+++ b/lisp/init-ibuffer.el
@@ -65,3 +65,5 @@
 
 ;; Don't show empty filter groups.
 (setq ibuffer-show-empty-filter-groups nil)
+
+(provide 'init-ibuffer)
diff --git a/init/km-ido.el b/lisp/init-ido.el
index 11edacc..078107f 100644
--- a/init/km-ido.el
+++ b/lisp/init-ido.el
@@ -28,3 +28,5 @@
   (let ((file (ido-completing-read "Choose recent file: " recentf-list nil t)))
     (when file
       (find-file file))))
+
+(provide 'init-ido)
diff --git a/init/km-keybindings.el b/lisp/init-keybindings.el
index 4343150..70ad6b3 100644
--- a/init/km-keybindings.el
+++ b/lisp/init-keybindings.el
@@ -26,3 +26,5 @@
 (global-set-key (kbd "C-;") 'er/expand-region)
 
 (define-key external-map "s" 'shell-command)
+
+(provide 'init-keybindings)
diff --git a/init/km-keychord.el b/lisp/init-keychord.el
index 3312897..8b1603a 100644
--- a/init/km-keychord.el
+++ b/lisp/init-keychord.el
@@ -32,3 +32,5 @@
 (key-chord-define-global ";g" 'projectile-grep)
 (key-chord-define-global ";r" 'projectile-replace)
 (key-chord-define-global ";c" 'projectile-commander)
+
+(provide 'init-keychord)
diff --git a/init/20-keymaps.el b/lisp/init-keymaps.el
index 4cc8223..eb1db41 100644
--- a/init/20-keymaps.el
+++ b/lisp/init-keymaps.el
@@ -14,3 +14,5 @@
 
 (define-prefix-command 'external-map)
 (global-set-key (kbd "C-c x") 'external-map)
+
+(provide 'init-keymaps)
diff --git a/init/km-modes.el b/lisp/init-modes.el
index 87ff5e5..5db7a41 100644
--- a/init/km-modes.el
+++ b/lisp/init-modes.el
@@ -11,3 +11,5 @@
  (lambda (mode) (setq auto-mode-alist
                       (cons mode auto-mode-alist)))
  km/modes)
+
+(provide 'init-modes)
diff --git a/init/km-org.el b/lisp/init-org.el
index 2b8af45..274e673 100644
--- a/init/km-org.el
+++ b/lisp/init-org.el
@@ -145,3 +145,5 @@ files.")
   "Exclude DONE state from refile targets."
   (not (member (nth 2 (org-heading-components)) org-done-keywords)))
 (setq org-refile-target-verify-function 'km/verify-refile-target)
+
+(provide 'init-org)
diff --git a/init/km-orgcontacts.el b/lisp/init-orgcontacts.el
index b6faa3b..548c146 100644
--- a/init/km-orgcontacts.el
+++ b/lisp/init-orgcontacts.el
@@ -5,3 +5,5 @@
 (add-to-list 'org-capture-templates
              '("a" "email address" entry (file+headline "~/notes/contacts.org" "Inbox")
                "** %(org-contacts-template-name)\n   :PROPERTIES:\n   :EMAIL: %(org-contacts-template-email)\n   :END:"))
+
+(provide 'init-orgcontacts)
diff --git a/init/10-km-pkg.el b/lisp/init-pkg.el
index b36ac03..0b248ef 100644
--- a/init/10-km-pkg.el
+++ b/lisp/init-pkg.el
@@ -49,3 +49,5 @@
 (add-to-list 'load-path "~/.emacs.d/vendor/")
 (add-to-list 'load-path "~/src/emacs/org-mode/lisp")
 (add-to-list 'load-path "~/src/emacs/org-mode/contrib/lisp" t)
+
+(provide 'init-pkg)
diff --git a/init/km-projectile.el b/lisp/init-projectile.el
index 585f399..66da4c6 100644
--- a/init/km-projectile.el
+++ b/lisp/init-projectile.el
@@ -25,3 +25,5 @@ I have set `projectile-switch-project-action' to
   'km/projectile-switch-project-to-file)
 
 (setq projectile-use-git-grep t)
+
+(provide 'init-projectile)
diff --git a/init/km-python.el b/lisp/init-python.el
index 57f6ff4..ae4871b 100644
--- a/init/km-python.el
+++ b/lisp/init-python.el
@@ -41,3 +41,5 @@ Unless a prefix argument ARG is given, py.test is also imported."
 (add-to-list 'interpreter-mode-alist '("python3" . python-mode))
 
 (setq python-fill-docstring-style 'pep-257-nn)
+
+(provide 'init-python)
diff --git a/init/km-smex.el b/lisp/init-smex.el
index e5fc6ec..94e48b5 100644
--- a/init/km-smex.el
+++ b/lisp/init-smex.el
@@ -5,3 +5,5 @@
 (global-set-key (kbd "M-X") 'smex-major-mode-commands)
 ;; Old M-x
 (global-set-key (kbd "M-x") 'execute-extended-command)
+
+(provide 'init-smex)
diff --git a/init/km-tex.el b/lisp/init-tex.el
index 761a854..3654a87 100644
--- a/init/km-tex.el
+++ b/lisp/init-tex.el
@@ -16,3 +16,5 @@
 (setq reftex-default-bibliography
       (quote
        ("~/refs/refs.bib")))
+
+(provide 'init-tex)
diff --git a/init/km-yas.el b/lisp/init-yas.el
index 4787527..1c0c74a 100644
--- a/init/km-yas.el
+++ b/lisp/init-yas.el
@@ -9,3 +9,5 @@
 (add-hook 'LaTeX-mode-hook
           '(lambda ()
              (yas-minor-mode)))
+
+(provide 'init-yas)