diff options
| author | benj <benj@rse8.com> | 2017-06-06 11:03:26 -0700 |
|---|---|---|
| committer | benj <benj@rse8.com> | 2017-06-06 11:03:26 -0700 |
| commit | 6a0fbbd87a717788991cd61af1cbd73881819b6d (patch) | |
| tree | 272283e43e233b85d34ba72a2fea2f25f5e7a404 /init.el | |
| parent | 84fc1dbdb9ca9b83df05d135a5edcff25ffa5db3 (diff) | |
| parent | 53853e36fa71b0c2d79d3593ebddd70b9be3b26b (diff) | |
| download | emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.gz emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.bz2 emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.lz emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.xz emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.tar.zst emacs-6a0fbbd87a717788991cd61af1cbd73881819b6d.zip | |
Merge branch 'master' of https://github.com/benjbellon/emacs.d
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -1,4 +1,11 @@ ;; Suppress splash screen + +;; Added by Package.el. This must come before configurations of +;; installed packages. Don't delete this line. If you don't want it, +;; just comment it out by adding a semicolon to the start of the line. +;; You may delete these explanatory comments. +(package-initialize) + (setq inhibit-startup-message t) (setq settings-dir @@ -25,6 +32,7 @@ clojure-mode-extra-font-locking clojure-snippets dash + elm-mode ember-mode ensime flycheck @@ -34,15 +42,18 @@ haskell-mode highlight-escape-sequences ido-vertical-mode - js2-mode magit markdown-mode multiple-cursors paredit + play-routes-mode + purescript-mode + org-bullets sbt-mode scala-mode visual-regexp web-mode + yaml-mode yasnippet))) (condition-case nil @@ -65,11 +76,14 @@ (require 'setup-flycheck) (require 'setup-haskell-mode) (require 'setup-ido) -(require 'setup-js-mode) +(require 'setup-magit) (require 'setup-markdown-mode) (require 'setup-multiple-cursors) +(require 'setup-org-mode) +(require 'setup-purescript-mode) (require 'setup-scala-mode) (require 'setup-web-mode) +(require 'setup-yaml-mode) (require 'setup-yasnippet) (require 'visual-regexp) |