emacs: Moved some configurations around and fixed init-modes.el

4 files changed, 10 insertions, 14 deletions

diff --git a/emacs.d/init-custom.el b/emacs.d/init-custom.el
index e0ef7ce63b32..b77eae8dcf37 100644
--- a/emacs.d/init-custom.el
+++ b/emacs.d/init-custom.el
@@ -5,7 +5,7 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    (quote
-    ("ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default)))
+    ("8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default)))
  '(erc-modules
    (quote
     (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track)))
diff --git a/emacs.d/init-modes.el b/emacs.d/init-modes.el
index d7415fda06aa..6e523c387734 100644
--- a/emacs.d/init-modes.el
+++ b/emacs.d/init-modes.el
@@ -1,3 +1,4 @@
+(mapc 'require '(projectile))
 ;; Initializes modes I use.
 
 (add-hook 'prog-mode-hook 'esk-pretty-lambdas)
@@ -33,6 +34,11 @@
 (setq nrepl-hide-special-buffers t)
 (setq nrepl-popup-stacktraces nil)
 
-;; Paredit in nrepl
-(add-hook 'nrepl-mode-hook 'paredit-mode)
-(add-hook 'nrepl-mode-hook 'rainbow-delimiters-mode)
+;; Enable projectile for all things programming
+(add-hook 'prog-mode-hook 'projectile-on)
+
+;; Enable rainbow-delimiters for all things programming
+(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+
+;; Enable paredit in all programming buffers
+(add-hook 'prog-mode-hook 'paredit-mode)
diff --git a/emacs.d/init-settings.el b/emacs.d/init-settings.el
index 1d72624b3e4c..7e0d7ca786b8 100644
--- a/emacs.d/init-settings.el
+++ b/emacs.d/init-settings.el
@@ -90,15 +90,6 @@ comment as a filename."
 ;; Hiding JOIN, QUIT, PART
 (setq erc-hide-list '("JOIN" "PART" "QUIT"))
 
-;; Enable projectile for all things programming
-(add-hook 'prog-mode-hook 'projectile-on)
-
-;; Enable rainbow-delimiters for all things programming
-(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
-
-;; Enable paredit in all Lisps
-(add-hook 'lisp-mode-hook 'paredit-mode)
-
 (eval-after-load 'diff-mode
   '(progn
      (set-face-foreground 'diff-added "green4")
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7d8733fe487d..235cff1f4bb1 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -40,7 +40,6 @@
 
 ;; IRC configuration (erc)
 ;; Actual servers and such are loaded from irc.el
-(require 'erc)
 (load "~/.emacs.d/irc")
 
 ;; Seed RNG