From 466211df874cd3fd4c526acdab9a65b0df376d76 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett@blangdon.com>
Date: Sun, 17 Jan 2016 10:44:51 -0500
Subject: [PATCH] update emacs config

---
 emacs | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/emacs b/emacs
index d773eb7..3c6e25c 100644
--- a/emacs
+++ b/emacs
@@ -44,9 +44,6 @@
 (setq fci-rule-width 1)
 (setq fci-rule-color "yellow")
 
-;(setq sml/no-confirm-load-theme t)
-;(sml/setup)
-
 (display-time-mode 1)
 (display-battery-mode 1)
 
@@ -72,10 +69,10 @@
                               (highlight-indentation-mode 0)))
 (add-hook 'go-mode-hook (lambda()
                           (auto-complete-mode)
-                          (ac-config-default)
                           (require 'go-autocomplete)
                           (require 'auto-complete-config)
-                          (load-file "/Users/brettlangdon/go/src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
+                          (ac-config-default)
+                          (load-file "/Users/brettlangdon/go/src/golang.org/x/tools/cmd/oracle/oracle.el")
                           (go-oracle-mode)
                           (load-file "~/go/src/github.com/golang/lint/misc/emacs/golint.el")
                           (require 'golint)
@@ -83,18 +80,19 @@
                           (local-set-key (kbd "M-.") 'godef-jump)
                           (add-hook 'before-save-hook #'gofmt-before-save)))
 (add-hook 'js-mode-hook (lambda()
-                          (flymake-jslint-load)
-                          (setq js2-include-node-externs t)
-                          (setq js2-highlight-level 3)
-                          (setq js2-mode-show-parse-errors nil)
-                          (setq js2-mode-show-strict-warnings nil)
+                          (autoload 'jscs-indent-apply "jscs" nil t)
+                          (autoload 'jscs-fix "jscs" nil t)
+                          (autoload 'jscs-fix-before-save "jscs" nil t)
                           (js2-minor-mode)
                           (ac-js2-mode)
                           (company-mode)
-                          (setq js-indent-level 2)
-                          (setq flymak-jslint-args (mapcar
-                                                    'symbol-name
-                                                    '(--white --undef --nomen --regexp --plusplus --bitwise --newcap --sloppy --vars --eqeq --node)))))
+                          (add-hook 'before-save-hook #'jscs-fix-before-save)
+                          (setq js-indent-level 2)))
+(add-hook 'ruby-mode-hook (lambda()
+                            (flyspell-prog-mode)))
+(add-hook `css-mode-hook (lambda()
+                           (set1 css-indent-offset 2)))
 
 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.styl\\'" . css-mode))
 (add-to-list 'magic-mode-alist '("#!.*node" . js-mode))