diff --git a/.emacs b/.emacs
index 52ce816..26effc5 100644
--- a/.emacs
+++ b/.emacs
@@ -1,6 +1,23 @@
-;; slime
+;; Packages
+(package-initialize)
+(add-to-list 'package-archives
+ (cons "melpa" "https://melpa.org/packages/") t)
+
+;; Adams
+(add-to-list 'auto-mode-alist '("\\.adams\\'" . lisp-mode))
+
+;; web-mode
+(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode))
+;; Erlang
+(add-to-list 'load-path "/usr/local/lib/erlang21/lib/tools-3.0.2/emacs")
+(setq erlang-root-dir "/usr/local/lib/erlang21")
+(setq exec-path (cons "/usr/local/lib/erlang21/bin" exec-path))
+(require 'erlang-start)
+
+;; slime
(add-to-list 'load-path "~/common-lisp/slime/slime/")
(require 'slime-autoloads)
(add-to-list 'slime-contribs 'slime-fancy)
@@ -12,9 +29,9 @@
'utf-8-unix)
;; ruby
-
(setq ruby-insert-encoding-magic-comment nil)
+;; customize
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@@ -28,9 +45,13 @@
'(inhibit-startup-screen t)
'(js-indent-level 2)
'(menu-bar-mode nil)
+ '(package-selected-packages (quote (web-mode alchemist elixir-mode)))
'(scroll-bar-mode nil)
'(show-paren-mode t)
- '(tool-bar-mode nil))
+ '(tool-bar-mode nil)
+ '(web-mode-code-indent-offset 2)
+ '(web-mode-css-indent-offset 2)
+ '(web-mode-markup-indent-offset 2))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.