Skip to content

Commit

Permalink
Adding ruby settings
Browse files Browse the repository at this point in the history
  • Loading branch information
filipeamoreira committed Jan 10, 2012
1 parent a8087b2 commit ac4a669
Show file tree
Hide file tree
Showing 9 changed files with 196 additions and 17 deletions.
2 changes: 1 addition & 1 deletion _zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ fi
[[ -s "/Users/guto/.rvm/scripts/rvm" ]] && source "/Users/guto/.rvm/scripts/rvm"
[[ $TERM == eterm-color ]] && export TERM=xterm
export NODE_PATH=/usr/local/lib/node_modules
export PATH="$HOME/bin:/usr/local/bin:$HOME/scm/svn/depot_tools/:$PATH"
export PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:$HOME/scm/svn/depot_tools/:$PATH"
69 changes: 69 additions & 0 deletions emacs.d/el-get/.loaddefs.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
;;; .loaddefs.el --- automatically extracted autoloads
;;
;;; Code:


;;;### (autoloads (el-get-checksum el-get-make-recipes el-get-cd
;;;;;; el-get-self-update el-get-update-all el-get-version) "el-get/el-get"
;;;;;; "el-get/el-get.el" (20235 5861))
;;; Generated autoloads from el-get/el-get.el

(autoload 'el-get-version "el-get/el-get" "\
Message the current el-get version
\(fn)" t nil)

(autoload 'el-get-update-all "el-get/el-get" "\
Performs update of all installed packages.
\(fn)" t nil)

(autoload 'el-get-self-update "el-get/el-get" "\
Update el-get itself. The standard recipe takes care of reloading the code.
\(fn)" t nil)

(autoload 'el-get-cd "el-get/el-get" "\
Open dired in the package directory.
\(fn PACKAGE)" t nil)

(autoload 'el-get-make-recipes "el-get/el-get" "\
Loop over `el-get-sources' and write a recipe file for each
entry which is not a symbol and is not already a known recipe.
\(fn &optional DIR)" t nil)

(autoload 'el-get-checksum "el-get/el-get" "\
Compute the checksum of the given package, and put it in the kill-ring
\(fn PACKAGE)" t nil)

;;;***

;;;### (autoloads (el-get-list-packages) "el-get/el-get-list-packages"
;;;;;; "el-get/el-get-list-packages.el" (20235 5861))
;;; Generated autoloads from el-get/el-get-list-packages.el

(autoload 'el-get-list-packages "el-get/el-get-list-packages" "\
Display a list of packages.
\(fn)" t nil)

;;;***

;;;### (autoloads nil nil ("el-get/el-get-autoloads.el" "el-get/el-get-build.el"
;;;;;; "el-get/el-get-byte-compile.el" "el-get/el-get-core.el" "el-get/el-get-custom.el"
;;;;;; "el-get/el-get-dependencies.el" "el-get/el-get-install.el"
;;;;;; "el-get/el-get-methods.el" "el-get/el-get-notify.el" "el-get/el-get-recipes.el"
;;;;;; "el-get/el-get-status.el") (20235 5863 465487))

;;;***

(provide '.loaddefs)
;; Local Variables:
;; version-control: never
;; no-update-autoloads: t
;; coding: utf-8
;; End:
;;; .loaddefs.el ends here
Binary file added emacs.d/el-get/.loaddefs.elc
Binary file not shown.
1 change: 1 addition & 0 deletions emacs.d/el-get/.status.el
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(:el-get "installed")
1 change: 1 addition & 0 deletions emacs.d/el-get/el-get
Submodule el-get added at a22469
15 changes: 13 additions & 2 deletions emacs.d/guto.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
;; Add in your own as you wish:
(defvar my-packages '(starter-kit starter-kit-lisp starter-kit-js starter-kit-lisp
starter-kit-eshell starter-kit-ruby rinari windsize yasnippet
ruby-block ruby-electric ruby-end rvm rspec-mode javascript
ruby-block ruby-electric ruby-end rvm rspec-mode javascript
js2-mode sass-mode mode-compile flymake flymake-coffee flymake-css
flymake-cursor flymake-jshint flymake-jslint flymake-php flymake-ruby
flymake-sass flymake-shell)
flymake-sass flymake-shell ace-jump-mode autopair auto-indent-mode
coffee-mode multi-term haml-mode scss-mode)
"A list of packages to ensure are installed at launch.")

(dolist (p my-packages)
Expand Down Expand Up @@ -120,9 +121,19 @@
;; Loading Rinari
(add-hook 'ruby-mode-hook
(lambda () (rinari-launch)))
(add-hook 'html-hook
(lambda () (rinari-launch)))

;; SCSS mode
(setq scss-sass-command "/Users/guto/.rvm/gems/ruby-1.9.2-p290/bin/sass")
(setq scss-compile-at-save nil)
(autoload 'scss-mode "scss-mode")
(add-to-list 'auto-mode-alist '("\\.scss\\'" . scss-mode))

;; Normalize whitespace
(add-hook 'before-save-hook 'whitespace-cleanup)

;; Enabling global autopair mode
;;(autopair-global-mode t)
;; (setq autopair-autowrap t)

55 changes: 55 additions & 0 deletions emacs.d/guto/ruby.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
;; Lifted from emacs-prelude

;; Rake files are ruby, too, as are gemspecs, rackup files, and gemfiles.
(add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
(add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
(add-to-list 'auto-mode-alist '("\\.gemspec$" . ruby-mode))
(add-to-list 'auto-mode-alist '("\\.ru$" . ruby-mode))
(add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
(add-to-list 'auto-mode-alist '("Guardfile$" . ruby-mode))

;; We never want to edit Rubinius bytecode
(add-to-list 'completion-ignored-extensions ".rbc")

(autoload 'run-ruby "inf-ruby"
"Run an inferior Ruby process")
(autoload 'inf-ruby-keys "inf-ruby"
"Set local key defs for inf-ruby in ruby-mode")

;; yaml-mode
(require 'yaml-mode)
(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))

; TODO fix ruby-end and package ruby-block for marmalade

(require 'ruby-end)
(require 'ruby-block)

(defun prelude-ruby-mode-hook ()
(inf-ruby-keys)
;; turn off the annoying input echo in irb
(setq comint-process-echoes t)
(ruby-block-mode t)
(local-set-key (kbd "C-h r") 'yari))

(add-hook 'ruby-mode-hook 'prelude-ruby-mode-hook)

;; (require 'haml-mode)
;; (require 'scss-mode)

(defun prelude-scss-mode-hook ()
;; indent like in Ruby
(setq css-indent-offset 2)
;; turn off annoying auto-compile on save
(setq scss-compile-at-save nil))

(add-hook 'scss-mode-hook 'prelude-scss-mode-hook)

;; cucumber support
;; (require 'feature-mode)
;; (add-to-list 'auto-mode-alist '("\.feature$" . feature-mode))

;; load bundle snippets
;;(yas/load-directory (concat prelude-vendor-dir "feature-mode/snippets"))


48 changes: 46 additions & 2 deletions emacs.d/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,55 @@
(require 'package)
(add-to-list 'package-archives
'("marmalade" . "http://marmalade-repo.org/packages/") t)
(add-to-list 'package-archives
'("tromey" . "http://tromey.com/elpa/") t)
(add-to-list 'package-archives
'("tromey" . "http://tromey.com/elpa/") t)

(package-initialize)

;; Install starter-kit and others packages if they are not installed
(when (not package-archive-contents)
(package-refresh-contents))

;; Add in your own as you wish:
(defvar my-packages '(starter-kit starter-kit-lisp starter-kit-js starter-kit-lisp
starter-kit-eshell starter-kit-ruby rinari windsize yasnippet
ruby-block ruby-electric ruby-end rvm rspec-mode javascript
js2-mode sass-mode mode-compile flymake flymake-coffee flymake-css
flymake-cursor flymake-jshint flymake-jslint flymake-php flymake-ruby
flymake-sass flymake-shell ace-jump-mode autopair auto-indent-mode
coffee-mode multi-term haml-mode scss-mode)
"A list of packages to ensure are installed at launch.")

(dolist (p my-packages)
(when (not (package-installed-p p))
(package-install p)))


;; Installing/Loading el-get

(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
(unless (require 'el-get nil t)
(url-retrieve "https://raw.github.com/dimitri/el-get/master/el-get-install.el"
(lambda (s)
(let (el-get-master-branch)
(end-of-buffer) (eval-print-last-sexp)))) )

(require 'el-get)

;; Sets default packages to be installed

(setq el-get-sources
'((:name css-mode
:type elpa)
(:name expresso-mode
:type http
:url "http://download-mirror.savannah.gnu.org/releases/espresso/espresso.el")
(:name autopair
:after (lambda ()
(autopair-global-mode t)
(setq autopair-autowrap t)))))
(el-get 'sync)

;; Adding vendor/themes to themes path
(add-to-list 'custom-theme-load-path "~/.emacs.d/vendor/themes/")

Expand Down
22 changes: 10 additions & 12 deletions emacs.d/places
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
;;; -*- coding: utf-8 -*-
(("/Users/guto/.emacs.d/elpa/color-theme-6.6.1/color-theme-autoloads.el" . 4212)
("/Users/guto/.emacs.d/elpa/color-theme-sanityinc-solarized-2.10/color-theme-sanityinc-solarized-autoloads.el" . 908)
("/Users/guto/.emacs.d/elpa/color-theme-solarized-20111121/color-theme-solarized-autoloads.el" . 890)
("/Users/guto/.emacs.d/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el" . 795)
(("/Users/guto/.emacs.d/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el" . 795)
("/Users/guto/.emacs.d/elpa/inf-ruby-2.2.3/inf-ruby-autoloads.el" . 1247)
("/Users/guto/.emacs.d/elpa/solarized-theme-0.2/solarized-theme-autoloads.el" . 475)
("/Users/guto/.emacs.d/elpa/starter-kit-eshell-2.0.2/starter-kit-eshell-autoloads.el" . 1446)
("/Users/guto/.emacs.d/elpa/starter-kit-js-2.0.1/starter-kit-js-autoloads.el" . 772)
("/Users/guto/.emacs.d/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el" . 1915)
("/Users/guto/.emacs.d/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el" . 1916)
("/Users/guto/.emacs.d/elpa/starter-kit-ruby-2.0.1/starter-kit-ruby-autoloads.el" . 2274)
("/Users/guto/.emacs.d/elpa/undo-tree-0.3.1/undo-tree-autoloads.el" . 1675)
("/Users/guto/.emacs.d/elpa/windsize-0.1/windsize-autoloads.el" . 179)
("/Users/guto/.emacs.d/elpa/yas-jit-0.8.3/yas-jit-autoloads.el" . 423)
("/Users/guto/.emacs.d/elpa/yasnippet-0.6.1/yasnippet-autoloads.el" . 1199)
("/Users/guto/.emacs.d/guto/helper.el" . 10739)
("/Users/guto/.emacs.d/guto/ruby.el" . 869)
("/Users/guto/.emacs.d/guto/sane-defaults.el" . 897)
("/Users/guto/.emacs.d/init.el" . 403)
("/Users/guto/.emacs.d/vendor/themes/zenburn-theme.el" . 26512)
("/Users/guto/data/scm/git/dot-files/emacs.d/guto.el" . 170)
("/Users/guto/data/scm/git/dot-files/emacs.d/guto.el" . 950)
("/Users/guto/data/scm/git/dot-files/emacs.d/guto/ruby.el" . 700)
("/Users/guto/data/scm/git/dot-files/emacs.d/init.el" . 280)
("/Users/guto/data/work/freelance/echDesign/hangman/app/controllers/static_controller.rb" . 525)
("/Users/guto/data/work/freelance/echDesign/hangman/config/routes.rb" . 470)
("/Users/guto/scm/git/dot-files/emacs.d/guto.el" . 368)
("/Users/guto/scm/git/dot-files/emacs.d/guto/bindings.el" . 354)
("/Users/guto/scm/git/dot-files/emacs.d/init.el" . 403)
("/Users/guto/scm/git/dot-files/install" . 140)
("/Users/guto/scm/git/emacs-prelude/init.el" . 444)
("/Users/guto/scm/git/emacs-prelude/modules/prelude-ruby.el" . 2851)
("/Users/guto/scm/git/emacs-starter-kit/starter-kit-ruby.el" . 3823)
("/usr/local/Cellar/emacs/HEAD/share/emacs/24.0.92/lisp/battery.el.gz" . 7640))

0 comments on commit ac4a669

Please sign in to comment.