From e5b3ba4835aeb0e2ad22bd717a01709d573ed24a Mon Sep 17 00:00:00 2001
From: Grant <ghunter@drivewyze.com>
Date: Fri, 27 Oct 2017 12:11:44 -0600
Subject: [PATCH] add modes

---
 emacs/init.el                     |  2 +-
 emacs/super-emacs/key-bindings.el |  1 +
 emacs/super-emacs/packages.el     | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index bc14aa6..8f1d3e8 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -22,7 +22,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (company-terraform terraform-mode yaml-mode company racer rust-mode magit theme-looper myterminal-controls meta-presenter which-key dired-launch material-theme neotree undo-tree ztree buffer-move powerline ace-window ace-jump-mode multiple-cursors helm))))
+    (helm-projectile projectile json-mode jinja2-mode company-terraform terraform-mode yaml-mode company racer rust-mode magit theme-looper myterminal-controls meta-presenter which-key dired-launch material-theme neotree undo-tree ztree buffer-move powerline ace-window ace-jump-mode multiple-cursors helm))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs/super-emacs/key-bindings.el b/emacs/super-emacs/key-bindings.el
index 74cbd3e..ab6d16e 100644
--- a/emacs/super-emacs/key-bindings.el
+++ b/emacs/super-emacs/key-bindings.el
@@ -27,6 +27,7 @@
     ("s--" . text-scale-decrease)
     ("s-=" . text-scale-increase)
     ("C-c m" . magit-status)
+    ("C-c g" . helm-projectile-grep)
     ))
 
 (defun super-emacs-apply-keyboard-bindings (pair)
diff --git a/emacs/super-emacs/packages.el b/emacs/super-emacs/packages.el
index b8c5d3e..0302e0b 100644
--- a/emacs/super-emacs/packages.el
+++ b/emacs/super-emacs/packages.el
@@ -22,8 +22,10 @@
     magit
     rust-mode
     yaml-mode
+    jinja2-mode
+    json-mode
     terraform-mode
-    terraform-company
+    company-terraform
     racer
     company
     projectile
@@ -51,6 +53,19 @@
 (setq company-idle-delay 0)
 (setq company-minimum-prefix-length 2)
 
+(defvar company-mode-whitelist
+  '(
+    js-mode-hook
+    python-mode-hook
+    rust-mode-hook
+    lisp-mode-hook
+    terraform-mode-hook
+    ))
+
+(mapc (lambda (h)
+        (add-hook h #'company-mode))
+      company-mode-whitelist)
+
 
 ;Set up ace-jump-mode
 (autoload 'ace-jump-mode