diff --git a/contrib/lang/clojure/packages.el b/contrib/lang/clojure/packages.el index ab49c817d..ce2f9c94c 100644 --- a/contrib/lang/clojure/packages.el +++ b/contrib/lang/clojure/packages.el @@ -11,19 +11,10 @@ "List of all packages to install and/or initialize. Built-in packages which require an initialization must be listed explicitly in the list.") -(defun clojure/init-clojure-mode () - (use-package clojure-mode +(defun clojure/init-ac-cider () + (use-package ac-cider :defer t - :mode (("\.clj$" . clojure-mode) - ("\.cljs$" . clojure-mode) - ("\.cljx$" . clojure-mode) - ("\.edn$" . clojure-mode) - ("\.boot$" . clojure-mode) - ("\.cljs\.hl$" . clojure-mode)) - :config - (progn - (when clojure-enable-fancify-symbols - (clojure/fancify-symbols 'clojure-mode))))) + :config (add-to-list 'ac-modes 'cider-mode))) (defun clojure/init-cider () (use-package cider @@ -130,11 +121,6 @@ the focus." (when clojure-enable-fancify-symbols (clojure/fancify-symbols 'cider-repl-mode))))) -(defun clojure/init-ac-cider () - (use-package ac-cider - :defer t - :config (add-to-list 'ac-modes 'cider-mode))) - (defun clojure/init-clj-refactor () (use-package clj-refactor :defer t @@ -183,6 +169,20 @@ the focus." "mr-ua" 'cljr-unwind-all "mr-uw" 'cljr-unwind)))) +(defun clojure/init-clojure-mode () + (use-package clojure-mode + :defer t + :mode (("\.clj$" . clojure-mode) + ("\.cljs$" . clojure-mode) + ("\.cljx$" . clojure-mode) + ("\.edn$" . clojure-mode) + ("\.boot$" . clojure-mode) + ("\.cljs\.hl$" . clojure-mode)) + :config + (progn + (when clojure-enable-fancify-symbols + (clojure/fancify-symbols 'clojure-mode))))) + (defun clojure/init-rainbow-delimiters () (if configuration-layer/package-declaredp 'cider (add-hook 'cider-mode-hook 'rainbow-delimiters-mode)))