From 553b1766990672412862c8e5da6946d353cafc71 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett@blangdon.com>
Date: Fri, 8 May 2015 09:25:35 -0400
Subject: [PATCH] update emacs config

---
 emacs | 59 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/emacs b/emacs
index fe1c106..9eabba7 100644
--- a/emacs
+++ b/emacs
@@ -5,13 +5,17 @@
 (setq initial-scratch-message "")
 (setq vc-follow-symlinks t)
 
+(add-to-list 'load-path "~/.emacs.d/manual")
 (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
-                         ("marmalade" . "http://marmalade-repo.org/packages/")
-			 ("melpa" . "http://melpa.milkbox.net/packages/")))
+                         ("marmalade" . "https://marmalade-repo.org/packages/")
+			 ("melpa" . "http://melpa.milkbox.net/packages/")
+                         ("elpy" . "http://jorgenschaefer.github.io/packages/")))
 (package-initialize)
+(osx-clipboard-mode +1)
 
-(color-theme-initialize)
-(color-theme-monokai)
+(load-theme 'monokai t)
+(require 'powerline)
+(powerline-default-theme)
 
 (setq backup-inhibited t)
 (setq auto-save-default nil)
@@ -40,8 +44,9 @@
 (setq fci-rule-width 1)
 (setq fci-rule-color "yellow")
 
-(setq sml/no-confirm-load-theme t)
-(sml/setup)
+;(setq sml/no-confirm-load-theme t)
+;(sml/setup)
+
 (display-time-mode 1)
 (display-battery-mode 1)
 
@@ -49,17 +54,9 @@
 (helm-mode 1)
 (projectile-global-mode 1)
 (global-subword-mode 1)
-(add-hook 'find-file-hook (lambda()
-                            (flymake-find-file-hook)
-                            (flymake-cursor-mode)))
 
-(add-hook 'web-mode-hook (lambda()
-                           (auto-complete-mode)
-                           (setq web-mode-markup-indent-offset 2)
-                           (set-face-attribute 'web-mode-html-tag-bracket-face nil :foreground "white")))
-(add-hook 'php-mode-hook (lambda()
-                           (auto-complete-mode)
-                           (flymake-php-mode)))
+(add-hook 'flymake-find-file-hook (lambda()
+                                    (flymake-cursor-mode)))
 (add-hook 'markdown-mode-hook (lambda()
                                 (require 'poly-markdown)
                                 (poly-markdown-mode 1)
@@ -70,11 +67,33 @@
 (add-hook 'python-mode-hook (lambda()
                               (elpy-mode)
                               (elpy-enable)
+                              (setq python-indent 4)
                               (setq elpy-rpc-backend "jedi")
                               (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 "$GOPATH/src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
+                          (go-oracle-mode)
+                          (setq gofmt-command "goimports")
+                          (local-set-key (kbd "M-.") 'godef-jump)
+                          (add-hook 'before-save-hook #'gofmt-before-save)))
+(add-hook 'js-mode-hook (lambda()
+                          (flymake-jslint-load)
+                          (flymake-cursor-mode)
+                          (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)
+                          (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-to-list 'auto-mode-alist '("\\.php\\'" . php-mode))
-(add-to-list 'auto-mode-alist '("\\tpl.*.php\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\tag.*.php\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+(add-to-list 'magic-mode-alist '("#!.*node" . js-mode))