added packages: ember, scala, ensime, clojure, js, magit, web

8 files changed, 74 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 46edd8b..86ce92f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 backups
 elpa
+ensime
 history
 places
 recentf
diff --git a/init.el b/init.el
index d2f6c5c..a426f5a 100644
--- a/init.el
+++ b/init.el
@@ -25,6 +25,8 @@
      clojure-mode-extra-font-locking
      clojure-snippets
      dash
+     ember-mode
+     ensime
      flycheck
      flycheck-clojure
      flycheck-haskell
@@ -32,11 +34,15 @@
      haskell-mode
      highlight-escape-sequences
      ido-vertical-mode
+     js2-mode
+     magit
      markdown-mode
      multiple-cursors
      paredit
+     sbt-mode
      scala-mode
      visual-regexp
+     web-mode
      yasnippet)))
 
 (condition-case nil
@@ -51,13 +57,19 @@
   (require-package 'exec-path-from-shell)
   (exec-path-from-shell-initialize))
 
+(add-to-list 'exec-path "/usr/local/bin")
+
 (require 'setup-c++-mode)
 (require 'setup-clojure-mode)
+(require 'setup-ember-mode)
 (require 'setup-flycheck)
 (require 'setup-haskell-mode)
 (require 'setup-ido)
+(require 'setup-js-mode)
 (require 'setup-markdown-mode)
 (require 'setup-multiple-cursors)
+(require 'setup-scala-mode)
+(require 'setup-web-mode)
 (require 'setup-yasnippet)
 
 (require 'visual-regexp)
diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el
index 109b074..2c2e9b3 100644
--- a/settings/setup-clojure-mode.el
+++ b/settings/setup-clojure-mode.el
@@ -5,4 +5,7 @@
 (add-hook 'clojure-mode-hook 'enable-paredit-mode)
 (add-hook 'clojure-mode-hook 'prettify-symbols-mode)
 
+;; This should be in it's own setup file
+(add-to-list 'auto-mode-alist '("\\.el\\'" . paredit-mode))
+
 (provide 'setup-clojure-mode)
diff --git a/settings/setup-ember-mode.el b/settings/setup-ember-mode.el
new file mode 100644
index 0000000..5a56413
--- /dev/null
+++ b/settings/setup-ember-mode.el
@@ -0,0 +1,3 @@
+(require 'ember-mode)
+;;; setup ember mode
+(provide 'setup-ember-mode)
diff --git a/settings/setup-js-mode.el b/settings/setup-js-mode.el
new file mode 100644
index 0000000..a3434fc
--- /dev/null
+++ b/settings/setup-js-mode.el
@@ -0,0 +1,10 @@
+(require 'js2-mode)
+
+(add-hook 'js2-mode-hook 'ac-js2-mode)
+(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+
+(custom-set-variables
+ '(js2-basic-offset 2)
+ '(js2-bounce-indent-p t))
+
+(provide 'setup-js-mode)
diff --git a/settings/setup-magit.el b/settings/setup-magit.el
new file mode 100644
index 0000000..4e85e17
--- /dev/null
+++ b/settings/setup-magit.el
@@ -0,0 +1,5 @@
+(require 'magit)
+
+(global-set-key (kbd "C-x g") 'magit-status)
+
+(provide 'setup-magit)
diff --git a/settings/setup-scala-mode.el b/settings/setup-scala-mode.el
new file mode 100644
index 0000000..c249a4e
--- /dev/null
+++ b/settings/setup-scala-mode.el
@@ -0,0 +1,7 @@
+(require 'scala-mode)
+(require 'ensime)
+
+(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
+
+(provide 'setup-scala-mode)
+
diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el
new file mode 100644
index 0000000..b3893cf
--- /dev/null
+++ b/settings/setup-web-mode.el
@@ -0,0 +1,33 @@
+(require 'web-mode)
+
+
+(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.hbs\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
+
+
+(set-face-attribute 'web-mode-doctype-face nil :foreground "misty rose")
+(set-face-attribute 'web-mode-html-tag-face nil :foreground "medium slate blue")
+(set-face-attribute 'web-mode-html-attr-name-face nil :foreground "orange")
+(set-face-attribute 'web-mode-html-tag-bracket-face nil :foreground "gray")
+(set-face-attribute 'web-mode-block-control-face nil :foreground "deep sky blue")
+(set-face-attribute 'web-mode-block-delimiter-face nil :foreground "medium aquamarine")
+
+(setq web-mode-engines-alist
+      '(("handlebars" . "\\.hbs'")))
+
+(defun indent-offset ()
+  "Hooks for web mode."
+  (setq web-mode-markup-indent-offset 2)
+  (setq web-mode-css-indent-offset 2)
+  (setq web-mode-style-padding 2)
+  (setq web-mode-script-padding 2))
+
+(add-hook 'web-mode-hook 'indent-offset)
+
+(provide 'setup-web-mode)