11 files changed, 17 insertions, 23 deletions
diff --git a/tools/emacs/init/bindings.el b/tools/emacs/config/bindings.el
index f10869a5325f..f10869a5325f 100644
--- a/tools/emacs/init/bindings.el
+++ b/tools/emacs/config/bindings.el
diff --git a/tools/emacs/init/custom.el b/tools/emacs/config/custom.el
index a157c7a5fa37..a157c7a5fa37 100644
--- a/tools/emacs/init/custom.el
+++ b/tools/emacs/config/custom.el
diff --git a/tools/emacs/init/desktop.el b/tools/emacs/config/desktop.el
index dcc35383370a..dcc35383370a 100644
--- a/tools/emacs/init/desktop.el
+++ b/tools/emacs/config/desktop.el
diff --git a/tools/emacs/init/eshell-setup.el b/tools/emacs/config/eshell-setup.el
index 0b23c5a2d1bc..0b23c5a2d1bc 100644
--- a/tools/emacs/init/eshell-setup.el
+++ b/tools/emacs/config/eshell-setup.el
diff --git a/tools/emacs/init/functions.el b/tools/emacs/config/functions.el
index e0bc496a538f..e0bc496a538f 100644
--- a/tools/emacs/init/functions.el
+++ b/tools/emacs/config/functions.el
diff --git a/tools/emacs/init.el b/tools/emacs/config/init.el
index eb78461433a2..2086117967a3 100644
--- a/tools/emacs/init.el
+++ b/tools/emacs/config/init.el
@@ -8,9 +8,6 @@
 
 (package-initialize)
 
-;; Add 'init' folder that contains other settings to load.
-(add-to-list 'load-path (concat user-emacs-directory "init"))
-
 ;; Initialise all packages installed via Nix.
 ;;
 ;; TODO: Generate this section in Nix for all packages that do not
@@ -140,27 +137,24 @@
 ;; Seed RNG
 (random t)
 
-(defun load-other-settings ()
-  (mapc 'require '(desktop
-		   mail-setup
-                   look-and-feel
-                   functions
-                   settings
-                   modes
-                   bindings
-                   term-setup
-                   eshell-setup))
-  (telephone-line-setup)
-  (ace-window-display-mode))
-
-;; If a local configuration file exists, it should be loaded.
+;; Load all other Emacs configuration. These configurations are
+;; added to `load-path' by Nix.
+(mapc 'require '(desktop
+                 mail-setup
+                 look-and-feel
+                 functions
+                 settings
+                 modes
+                 bindings
+                 term-setup
+                 eshell-setup))
+(telephone-line-setup)
+(ace-window-display-mode)
+
+;; If a local configuration file exists, it should be loaded. No
+;; other configuration comes from `user-emacs-directory'.
 (let ((local-file (expand-file-name (f-join user-emacs-directory "local.el"))))
   (when (f-exists? local-file)
     (load local-file)))
 
-;; Some packages can only be initialised after the rest of the
-;; settings has been applied:
-
-(add-hook 'after-init-hook 'load-other-settings)
-(put 'narrow-to-region 'disabled nil)
-(put 'upcase-region 'disabled nil)
+(provide 'init)
diff --git a/tools/emacs/init/look-and-feel.el b/tools/emacs/config/look-and-feel.el
index 8f42133fb8a0..8f42133fb8a0 100644
--- a/tools/emacs/init/look-and-feel.el
+++ b/tools/emacs/config/look-and-feel.el
diff --git a/tools/emacs/init/mail-setup.el b/tools/emacs/config/mail-setup.el
index 71cfb92ff53c..71cfb92ff53c 100644
--- a/tools/emacs/init/mail-setup.el
+++ b/tools/emacs/config/mail-setup.el
diff --git a/tools/emacs/init/modes.el b/tools/emacs/config/modes.el
index 19ed2a684349..19ed2a684349 100644
--- a/tools/emacs/init/modes.el
+++ b/tools/emacs/config/modes.el
diff --git a/tools/emacs/init/settings.el b/tools/emacs/config/settings.el
index 0bcf73b0e794..0bcf73b0e794 100644
--- a/tools/emacs/init/settings.el
+++ b/tools/emacs/config/settings.el
diff --git a/tools/emacs/init/term-setup.el b/tools/emacs/config/term-setup.el
index cd4f9c25ef73..cd4f9c25ef73 100644
--- a/tools/emacs/init/term-setup.el
+++ b/tools/emacs/config/term-setup.el