From 2b0a8efc4f1bb64c5a4f5da6abbc7d3923d77e4e Mon Sep 17 00:00:00 2001
From: angrygoats <tbockman@xchg.sh>
Date: Wed, 13 Jun 2018 21:46:58 -0700
Subject: [PATCH] SDKMAN and meson mode

---
 dotfiles/emacs.d/init.el    | 3 +++
 dotfiles/emacs.d/package.el | 1 +
 dotfiles/zshrc              | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 702623a..5e8e1ea 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -358,6 +358,9 @@
 
 (add-hook 'c-mode-hook 'my-c-mode-hook)
 
+;; I use meson mostly for C/C++ development so this hook lives here
+(add-hook 'meson-mode-hook 'company-mode)
+
 ;;--------------------------------------------------------------------------------------
 ;; Java Mode Setup
 ;;-------------------------------------------------------------------------------------
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index c009a65..acb81d4 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -17,6 +17,7 @@
                       markdown-mode
                       gitignore-mode
                       feature-mode
+                      meson-mode
                       paredit
                       magit
                       ;;;;;;;;;;;;;;;;;;;;
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 3a5799c..3841139 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -137,3 +137,7 @@ if [ -f /home/$USER/.rvm/scripts/rvm ]; then
   source /home/$USER/.rvm/scripts/rvm
 fi
 
+
+#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="/home/taylor/.sdkman"
+[[ -s "/home/taylor/.sdkman/bin/sdkman-init.sh" ]] && source "/home/taylor/.sdkman/bin/sdkman-init.sh"