Replace electric-indent-mode and paredit with smartparens

core/prelude-core.el

@@ -100,7 +100,8 @@ With a prefix ARG open line above the current line."
       (prelude-smart-open-line-above)
     (progn
       (move-end-of-line nil)
-      (newline-and-indent))))
+      (newline-and-indent)
+      (shit))))
 
 (defun prelude-top-join-line ()
   "Join the current line with the line beneath it."
@@ -321,12 +322,12 @@ the current buffer."
   (interactive)
   (insert (format-time-string "%c" (current-time))))
 
-(defun prelude-conditionally-enable-paredit-mode ()
-  "Enable `paredit-mode' in the minibuffer, during `eval-expression'."
-  (if (eq this-command 'eval-expression)
-      (paredit-mode 1)))
+;; (defun prelude-conditionally-enable-paredit-mode ()
+;;   "Enable `paredit-mode' in the minibuffer, during `eval-expression'."
+;;   (if (eq this-command 'eval-expression)
+;;       (paredit-mode 1)))
 
-(add-hook 'minibuffer-setup-hook 'prelude-conditionally-enable-paredit-mode)
+;; (add-hook 'minibuffer-setup-hook 'prelude-conditionally-enable-paredit-mode)
 
 (defun prelude-recentf-ido-find-file ()
   "Find a recent file using ido."

core/prelude-editor.el

@@ -102,7 +102,9 @@ Will only occur if prelude-whitespace is also enabled."
                                          try-complete-lisp-symbol))
 
 ;; smart pairing for all
-(electric-pair-mode t)
+(setq sp-base-key-bindings 'paredit)
+(require 'smartparens-config)
+(smartparens-global-mode +1)
 
 ;; diminish keeps the modeline tidy
 (require 'diminish)

core/prelude-packages.el

@@ -46,7 +46,7 @@
     git-commit-mode gitconfig-mode gitignore-mode
     guru-mode helm helm-projectile ido-ubiquitous
     key-chord magit melpa rainbow-mode
-    smex solarized-theme undo-tree
+    smartparens smex solarized-theme undo-tree
     volatile-highlights yasnippet zenburn-theme)
   "A list of packages to ensure are installed at launch.")