 (setq auto-mode-alist (cons '("\\.cljs$" . clojure-mode) auto-mode-alist))
 ;;; cider config
 (require 'ac-cider)
-(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
+(add-hook 'cider-mode-hook #'eldoc-mode)
 (add-hook 'cider-repl-mode-hook 'subword-mode)
 (add-hook 'cider-repl-mode-hook 'paredit-mode)
 (add-hook 'cider-repl-mode-hook 'rainbow-delimiters-mode)
-
-;;; Java
-(add-hook 'java-mode-hook
-          (lambda ()
-            (setq c-basic-offset 2)))
-(add-to-list 'load-path "~/.emacs.d/malabar-1.5.0-SNAPSHOT/lisp/")
-(setq semantic-default-submodes '(global-semantic-idle-scheduler-mode
-                                  global-semanticdb-minor-mode
-                                  global-semantic-idle-summary-mode
-                                  global-semantic-mru-bookmark-mode))
-(semantic-mode 1)
-(require 'malabar-mode)
-(setq malabar-groovy-lib-dir "~/.emacs.d/malabar-1.5.0-SNAPSHOT/lib/")
-(add-to-list 'auto-mode-alist '("\\.java\\'" . malabar-mode))
+(setq nrepl-hide-special-buffers t)
+(setq nrepl-log-messages t)
+(setq cider-show-error-buffer 'only-in-repl)
 
 ;;; Javascript
+(defun js-custom ()
+  "js-mode-hook"
+  (setq js-indent-level 2))
+(add-hook 'js-mode-hook 'js-custom)
 ;; React
 (require 'react-snippets)
 ;; it's just JSX, don't overreact
 (require 'jsx-mode)
 (add-to-list 'auto-mode-alist '("\\.jsx\\'" . jsx-mode))
 (autoload 'jsx-mode "jsx-mode" "JSX mode" t)
-;;
-(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
-(custom-set-variables
- '(js2-basic-offset 2)
- '(js2-bounce-indent-p t))
 
 ;;; org mode!
 (require 'org-install)

(setq custom-file (locate-user-emacs-file "custom.el"))
(load custom-file 'noerror)



;;; dash-at-point
(require 'dash-at-point)
(global-set-key "\C-c\C-\M-d" 'dash-at-point)

;;; detab, and tab = 2 spaces
(setq-default indent-tabs-mode nil)
(setq standard-indent 2)
;; no tabs by default. modes that really need tabs should enable
;; indent-tabs-mode explicitly. makefile-mode already does that, for
;; example.

;;; Line numbering
;;; (from http://www.emacswiki.org/LineNumbers)
(defvar my-linum-format-string "%4d")

(require 'rainbow-delimiters)
(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)

;;; Clojure
(add-hook 'clojure-mode-hook 'paredit-mode)
;; Clojurescript/EDN highlighting
