diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index 36bf428..e5f0498 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -14,6 +14,8 @@
 			 magit
 			 markdown-mode
 			 projectile
+             go-mode
+             rust-mode
 			 yaml-mode)
   "Default packages")
 
diff --git a/home/.zshrc b/home/.zshrc
index df55ec7..2e523fc 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -35,6 +35,10 @@ if [ -d "$HOME/.linuxbrew" ]; then
     export INFOPATH="$HOME/.linuxbrew/share/info:$INFOPATH"
 fi
 
+# Go Setup
+export GOPATH="$HOME/go"
+export PATH="$PATH:$HOME/go/bin"
+
 if [ -f "$HOME/.update_dotfiles.sh" ]; then
     /usr/bin/env sh $HOME/.update_dotfiles.sh
 fi