about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--init-bindings.el4
-rw-r--r--init-modes.el8
-rw-r--r--init.el9
3 files changed, 13 insertions, 8 deletions
diff --git a/init-bindings.el b/init-bindings.el
index 3876f85c5e91..17c568c0ea73 100644
--- a/init-bindings.el
+++ b/init-bindings.el
@@ -65,8 +65,8 @@
 (define-key cider-repl-mode-map (kbd "C-<down>") 'next-line)
 
 ;; ... and ac-cider with C-c C-d
-(define-key cider-repl-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc)
-(define-key cider-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc)
+(define-key cider-repl-mode-map (kbd "C-c C-d") 'ac-cider-compliment-popup-doc)
+(define-key cider-mode-map (kbd "C-c C-d") 'ac-cider-compliment-popup-doc)
 (define-key cider-mode-map (kbd "C-c D") 'cider-doc)
 
 
diff --git a/init-modes.el b/init-modes.el
index 0f28b48d176f..f1a9a37174a6 100644
--- a/init-modes.el
+++ b/init-modes.el
@@ -1,4 +1,4 @@
-(mapc 'require '(projectile ac-nrepl cider project-explorer))
+(mapc 'require '(projectile ac-cider-compliment cider))
 ;; Initializes modes I use.
 
 (add-hook 'prog-mode-hook 'esk-add-watchwords)
@@ -23,9 +23,13 @@
 
 (defun cider-mode-setup ()
   "Activates paredit, rainbow delimiters and ac-nrepl"
-  (ac-nrepl-setup)
+  (ac-cider-compliment-setup)
+  (ac-flyspell-workaround)
   (paredit-mode))
 
+(eval-after-load "auto-complete"
+  '(add-to-list 'ac-modes cider-mode))
+
 (add-hook 'cider-repl-mode-hook 'cider-mode-setup)
 (add-hook 'cider-interaction-mode-hook 'cider-mode-setup)
 (eval-after-load "auto-complete"
diff --git a/init.el b/init.el
index 505873032731..2642901c8067 100644
--- a/init.el
+++ b/init.el
@@ -21,6 +21,7 @@
     ace-jump-mode
     ack-and-a-half
     browse-kill-ring
+    confluence
     dash
     flx-ido
     flycheck
@@ -31,22 +32,20 @@
     multiple-cursors
     nyan-mode
     paredit
-    project-explorer
     projectile
     puppet-mode
     rainbow-delimiters
     rainbow-mode
+    s
     smex
     smart-mode-line
     switch-window
     undo-tree
 
     ; Clojure
-    ac-nrepl
-    clojure-cheatsheet
+    ac-cider-compliment
     cider
     clojure-mode
-;    nrepl-eval-sexp-fu
 )
   "A list of packages to install at launch.")
 
@@ -107,6 +106,8 @@
 ;; Load magnars' string manipulation library
 (require 's)
 
+(require 'ack-and-a-half)
+
 ;; Seed RNG
 (random t)