From 3a057df7481324a4ba84e0bfebea4c71cb28cf16 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 22 Jun 2015 22:44:28 +0100 Subject: [PATCH] Update ruby and node.js environment setups --- env.el | 10 ---------- runtimes/nodejs.el | 14 +++++++++----- runtimes/ruby.el | 6 ++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/env.el b/env.el index d66c274..70d80b2 100644 --- a/env.el +++ b/env.el @@ -1,12 +1,2 @@ ;; Homebrew (push "/usr/local/bin" exec-path) - -;; ;; rbenv -;; (setq exec-path (cons "~/.rbenv/bin" exec-path)) -;; (setenv "PATH" (concat "~/.rbenv/bin:" (getenv "PATH"))) -;; (setq exec-path (cons "~/.rbenv/shims" exec-path)) -;; (setenv "PATH" (concat "~/.rbenv/shims:" (getenv "PATH"))) - -;; ;; node.js -;; (setq exec-path (cons "~/.nvm/v0.10.24/bin" exec-path)) -;; (setenv "PATH" (concat "~/.nvm/v0.10.24/bin:" (getenv "PATH"))) diff --git a/runtimes/nodejs.el b/runtimes/nodejs.el index 506892c..d4bd363 100644 --- a/runtimes/nodejs.el +++ b/runtimes/nodejs.el @@ -2,8 +2,12 @@ ;; Node.js setup ;; -;; nvm -(when (and - (file-directory-p (expand-file-name "~/.nvm")) - (require 'nvm nil 'noerror)) - (nvm-use "v0.10.24")) +;; node.js +(setq exec-path (cons "~/.nvm/v0.12.4/bin" exec-path)) +(setenv "PATH" (concat "~/.nvm/v0.12.4/bin:" (getenv "PATH"))) + +;; ;; nvm package - does not work >_< +;; (when (require 'nvm nil 'noerror) +;; (setq nvm-dir (expand-file-name "~/.nvm/versions/node")) +;; (when (file-directory-p nvm-dir) +;; (nvm-use "v0.10.24"))) diff --git a/runtimes/ruby.el b/runtimes/ruby.el index 49c1f09..c885b42 100644 --- a/runtimes/ruby.el +++ b/runtimes/ruby.el @@ -3,5 +3,11 @@ ;; ;; rbenv +(setq exec-path (cons "~/.rbenv/bin" exec-path)) +(setenv "PATH" (concat "~/.rbenv/bin:" (getenv "PATH"))) +(setq exec-path (cons "~/.rbenv/shims" exec-path)) +(setenv "PATH" (concat "~/.rbenv/shims:" (getenv "PATH"))) + +;; rbenv package - does not work >_< ;; (when (require 'rbenv nil 'noerror) ;; (global-rbenv-mode))