From f95c8bf2c85a1195755a16e9cfa1346126b81905 Mon Sep 17 00:00:00 2001
From: vikigenius <master.bvik@gmail.com>
Date: Tue, 6 Aug 2019 13:53:04 -0400
Subject: [PATCH 1/3] Feature: Added support for jsonnet

---
 modules/lang/data/config.el   | 4 ++++
 modules/lang/data/packages.el | 1 +
 2 files changed, 5 insertions(+)

diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index ca9772586..d14fbecf9 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -37,6 +37,10 @@
   :config
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 
+(use-package! jsonnet-mode
+  :mode "\\.jsonnet\\'"
+  :config
+  (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 
 ;;
 ;; Frameworks
diff --git a/modules/lang/data/packages.el b/modules/lang/data/packages.el
index dfe07cfe7..f5f588212 100644
--- a/modules/lang/data/packages.el
+++ b/modules/lang/data/packages.el
@@ -3,6 +3,7 @@
 
 (package! graphql-mode)
 (package! json-mode)
+(package! jsonnet-mode)
 (package! toml-mode)
 (package! yaml-mode)
 (package! csv-mode)

From df9509a29858b87786e3328b81bc32aadce26deb Mon Sep 17 00:00:00 2001
From: vikigenius <master.bvik@gmail.com>
Date: Tue, 6 Aug 2019 14:34:22 -0400
Subject: [PATCH 2/3] minor fixes

---
 modules/lang/data/config.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index d14fbecf9..06ac206c7 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -38,9 +38,9 @@
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 
 (use-package! jsonnet-mode
-  :mode "\\.jsonnet\\'"
+  :defer "\\.jsonnet\\'"
   :config
-  (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
+  (set-electric! 'jsonnet-mode :chars '(?\n ?: ?{ ?})))
 
 ;;
 ;; Frameworks

From 28a2d718c61452849e24dac01a4aa65ea718d26e Mon Sep 17 00:00:00 2001
From: vikigenius <master.bvik@gmail.com>
Date: Tue, 6 Aug 2019 14:42:46 -0400
Subject: [PATCH 3/3] defer loading jsonnet-mode

---
 modules/lang/data/config.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index 06ac206c7..2692fac8c 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -38,7 +38,7 @@
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 
 (use-package! jsonnet-mode
-  :defer "\\.jsonnet\\'"
+  :defer t
   :config
   (set-electric! 'jsonnet-mode :chars '(?\n ?: ?{ ?})))