 (add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
 (setq cider-repl-popup-stacktraces t)
 
+;; ac-nrepl (Auto-complete for the nREPL)
+(require 'ac-nrepl)
+(add-hook 'cider-mode-hook 'ac-nrepl-setup)
+(add-hook 'cider-repl-mode-hook 'ac-nrepl-setup)
+(add-to-list 'ac-modes 'cider-mode)
+(add-to-list 'ac-modes 'cider-repl-mode)
+
+;; Popping-up contextual documentation
+(eval-after-load "cider"
+  '(define-key cider-mode-map (kbd "C-c d") 'ac-nrepl-popup-doc))
+
 ;;; emacs-lisp-mode
-(add-hook 'emacs-lisp-mode-hook 'paredit-mode)
 (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
 
 ;;; haskell-mode

                      markdown-mode
                      mediawiki
                      multiple-cursors
                      nzenburn-theme
                      paredit
                      rust-mode
                      scala-mode2
                      slamhound

                      ghci-completion
                      go-mode
                      haskell-mode
                      ido-ubiquitous
                      key-chord
                      lua-mode
