3 files changed, 11 insertions, 1 deletions
diff --git a/emacs.d/config/fcuny-darwin.el b/emacs.d/config/fcuny-darwin.el
index fbc95e7..c23ff44 100644
--- a/emacs.d/config/fcuny-darwin.el
+++ b/emacs.d/config/fcuny-darwin.el
@@ -2,7 +2,6 @@
   (require 'use-package))
 
 (use-package exec-path-from-shell
-  :if (memq window-system '(mac ns))
   :ensure t
   :config
   (exec-path-from-shell-initialize)
diff --git a/emacs.d/config/fcuny-linux.el b/emacs.d/config/fcuny-linux.el
new file mode 100644
index 0000000..dc1f992
--- /dev/null
+++ b/emacs.d/config/fcuny-linux.el
@@ -0,0 +1,5 @@
+(setenv "PATH" (concat fcuny-path-go-bin path-separator (getenv "PATH")))
+
+(add-to-list 'exec-path fcuny-path-go-bin)
+
+(provide 'fcuny-linux)
diff --git a/emacs.d/config/fcuny-vars.el b/emacs.d/config/fcuny-vars.el
index cc19201..aebaadf 100644
--- a/emacs.d/config/fcuny-vars.el
+++ b/emacs.d/config/fcuny-vars.el
@@ -4,6 +4,12 @@
 (defvar fcuny-path-workspace (expand-file-name "workspace" fcuny-path-home)
   "Path to the workspace.")
 
+(defvar fcuny-path-go (expand-file-name "go" fcuny-path-workspace)
+  "Path to GOPATH.")
+
+(defvar fcuny-path-go-bin (expand-file-name "bin" fcuny-path-go)
+  "Path to the go binaries.")
+
 (defvar fcuny-path-git-twitter (expand-file-name "git.twitter.biz" fcuny-path-workspace)
   "Path to twitter's git repositories.")