From 1f581a4e3657ef2513a8add44b665cadda28f520 Mon Sep 17 00:00:00 2001
From: Matthew Lyon <matthew@lyonheart.us>
Date: Fri, 7 Sep 2018 20:35:29 -0700
Subject: [PATCH 1/2] Add option for flycheck-joker for clojure

This is provided as a +feature on clojure because joker is not included
in the standard clojure distribution, and I wouldn't assume a given
clojurist has or wants to have it installed. But I think installing it
is the least-fuss option for syntax-checking clojure/script code in
emacs with flycheck.
---
 init.example.el                  | 2 +-
 modules/lang/clojure/+joker.el   | 4 ++++
 modules/lang/clojure/config.el   | 3 +++
 modules/lang/clojure/packages.el | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 modules/lang/clojure/+joker.el

diff --git a/init.example.el b/init.example.el
index aaae090b1..e5d9ddc5f 100644
--- a/init.example.el
+++ b/init.example.el
@@ -80,7 +80,7 @@
        :lang
       ;assembly          ; assembly for fun or debugging
       ;(cc +irony +rtags); C/C++/Obj-C madness
-      ;clojure           ; java with a lisp
+      ;(clojure +joker)  ; java with a lisp
       ;common-lisp       ; if you've seen one lisp, you've seen them all
       ;coq               ; proofs-as-programs
       ;crystal           ; ruby at the speed of c
diff --git a/modules/lang/clojure/+joker.el b/modules/lang/clojure/+joker.el
new file mode 100644
index 000000000..cb0ac937e
--- /dev/null
+++ b/modules/lang/clojure/+joker.el
@@ -0,0 +1,4 @@
+;;; lang/clojure/+joker.el -*- lexical-binding: t; -*-
+
+(def-package! flycheck-joker
+  :after (flycheck clojure-mode))
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index f04e1b9a9..8a10c40a3 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -37,3 +37,6 @@
     (map! :map clj-refactor-map
           :localleader
           :desc "Refactor hydra" :n "r" #'hydra-cljr-help-menu/body)))
+
+(when (and (featurep! +joker) (featurep! :feature syntax-checker))
+  (load! "+joker"))
diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el
index a61dc39ed..50bef036b 100644
--- a/modules/lang/clojure/packages.el
+++ b/modules/lang/clojure/packages.el
@@ -4,3 +4,6 @@
 (package! cider)
 (package! clj-refactor)
 
+(when (and (featurep! :feature syntax-checker)
+           (featurep! +joker))
+  (package! flycheck-joker))

From ca033e714c8355c66cf94c8f15cad686e6894b75 Mon Sep 17 00:00:00 2001
From: Matthew Lyon <matthew@lyonheart.us>
Date: Sun, 9 Sep 2018 10:15:20 -0700
Subject: [PATCH 2/2] Remove +joker flag for clojure layer

Flycheck apparently won't complain if joker isn't installed
---
 init.example.el                  | 2 +-
 modules/lang/clojure/+joker.el   | 4 ----
 modules/lang/clojure/config.el   | 5 +++--
 modules/lang/clojure/packages.el | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 modules/lang/clojure/+joker.el

diff --git a/init.example.el b/init.example.el
index e5d9ddc5f..aaae090b1 100644
--- a/init.example.el
+++ b/init.example.el
@@ -80,7 +80,7 @@
        :lang
       ;assembly          ; assembly for fun or debugging
       ;(cc +irony +rtags); C/C++/Obj-C madness
-      ;(clojure +joker)  ; java with a lisp
+      ;clojure           ; java with a lisp
       ;common-lisp       ; if you've seen one lisp, you've seen them all
       ;coq               ; proofs-as-programs
       ;crystal           ; ruby at the speed of c
diff --git a/modules/lang/clojure/+joker.el b/modules/lang/clojure/+joker.el
deleted file mode 100644
index cb0ac937e..000000000
--- a/modules/lang/clojure/+joker.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;; lang/clojure/+joker.el -*- lexical-binding: t; -*-
-
-(def-package! flycheck-joker
-  :after (flycheck clojure-mode))
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index 8a10c40a3..ad2a334ea 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -38,5 +38,6 @@
           :localleader
           :desc "Refactor hydra" :n "r" #'hydra-cljr-help-menu/body)))
 
-(when (and (featurep! +joker) (featurep! :feature syntax-checker))
-  (load! "+joker"))
+(when (featurep! :feature syntax-checker)
+  (def-package! flycheck-joker
+    :after (flycheck clojure-mode)))
diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el
index 50bef036b..1f62de5fc 100644
--- a/modules/lang/clojure/packages.el
+++ b/modules/lang/clojure/packages.el
@@ -4,6 +4,5 @@
 (package! cider)
 (package! clj-refactor)
 
-(when (and (featurep! :feature syntax-checker)
-           (featurep! +joker))
+(when (featurep! :feature syntax-checker)
   (package! flycheck-joker))