diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 563b0a6..69be947 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -38,6 +38,11 @@ if [ "$system_type" = "Darwin" ]; then
     echo "Updating homebrew bundle"
     brew bundle --global
   fi
+
+  # Install powerline-go if necessary
+  if ! command -v powerline-go >/dev/null 2>&1; then
+    go install github.com/justjanne/powerline-go@latest
+  fi
 fi
 
 # Linux Specifics
diff --git a/.config/zsh/go.zsh##os.Darwin b/.config/zsh/go.zsh##os.Darwin
new file mode 100644
index 0000000..016b231
--- /dev/null
+++ b/.config/zsh/go.zsh##os.Darwin
@@ -0,0 +1,2 @@
+export PATH="$HOME/go/bin:$PATH"
+export GOPATH="$HOME/go"
diff --git a/.config/zsh/go.zsh b/.config/zsh/go.zsh##os.Linux
similarity index 100%
rename from .config/zsh/go.zsh
rename to .config/zsh/go.zsh##os.Linux