diff options
| -rw-r--r-- | users/glittershark/emacs.d/clojure.el | 42 | ||||
| -rw-r--r-- | users/glittershark/emacs.d/config.el | 39 |
2 files changed, 45 insertions, 36 deletions
diff --git a/users/glittershark/emacs.d/clojure.el b/users/glittershark/emacs.d/clojure.el new file mode 100644 index 000000000000..565ae982d61a --- /dev/null +++ b/users/glittershark/emacs.d/clojure.el @@ -0,0 +1,42 @@ +;;; ~/code/depot/users/glittershark/emacs.d/clojure.el -*- lexical-binding: t; -*- + +(defun clojure-thing-at-point-setup () + (interactive) + ;; Used by cider-find-dwim to parse the symbol at point + (setq-local + thing-at-point-file-name-chars + (concat thing-at-point-file-name-chars + "><!?"))) + +(after! clojure-mode + (define-clojure-indent + (PUT 2) + (POST 2) + (GET 2) + (PATCH 2) + (DELETE 2) + (context 2) + (checking 3) + (match 1) + (domonad 0) + (describe 1) + (before 1) + (it 2)) + + (add-hook 'clojure-mode-hook #'clojure-thing-at-point-setup)) + +(use-package! flycheck-clojure + ;; :disabled t + :after (flycheck cider) + :config + (flycheck-clojure-setup)) + +(after! clj-refactor + (setq cljr-magic-requires :prompt + cljr-clojure-test-declaration "[clojure.test :refer :all]" + cljr-cljc-clojure-test-declaration"#?(:clj [clojure.test :refer :all] +:cljs [cljs.test :refer-macros [deftest is testing]])" + ) + (add-to-list + 'cljr-magic-require-namespaces + '("s" . "clojure.spec.alpha"))) diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el index 51c268e1e68e..aaca78e4c768 100644 --- a/users/glittershark/emacs.d/config.el +++ b/users/glittershark/emacs.d/config.el @@ -27,6 +27,7 @@ (load! "email") (load! "cpp") (load! "lisp") +(load! "clojure") (require 'tvl) @@ -407,7 +408,8 @@ (after! paxedit (add-hook! emacs-lisp-mode #'paxedit-mode) - (add-hook! clojure-mode #'paxedit-mode)) + (add-hook! clojure-mode #'paxedit-mode) + (add-hook! common-lisp-mode #'paxedit-mode)) (require 'haskell) @@ -874,41 +876,6 @@ :for "for" :return "return" :yield "yield")) -(after! clojure-mode - (define-clojure-indent - (PUT 2) - (POST 2) - (GET 2) - (PATCH 2) - (DELETE 2) - (context 2) - (checking 3) - (match 1) - (domonad 0) - (describe 1) - (before 1) - (it 2))) - -(set-popup-rule! - "^\\*cider-test-report\\*$" - :size 0.5) - -(use-package! flycheck-clojure - ;; :disabled t - :after (flycheck cider) - :config - (flycheck-clojure-setup)) - -(after! clj-refactor - (setq cljr-magic-requires :prompt - cljr-clojure-test-declaration "[clojure.test :refer :all]" - cljr-cljc-clojure-test-declaration"#?(:clj [clojure.test :refer :all] -:cljs [cljs.test :refer-macros [deftest is testing])" - ) - (add-to-list - 'cljr-magic-require-namespaces - '("s" . "clojure.spec.alpha"))) - (use-package! sqlup-mode :hook (sql-mode-hook . sqlup-mode) |