From d356caedb0f7f2504cdd3f9ed14e6c691530f8a3 Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Wed, 31 Dec 2014 13:37:25 -0800
Subject: [PATCH] Config

---
 .emacs.d/core.el   | 5 ++++-
 .emacs.d/custom.el | 2 ++
 .gitconfig         | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.emacs.d/core.el b/.emacs.d/core.el
index 43b3e29..4956c62 100644
--- a/.emacs.d/core.el
+++ b/.emacs.d/core.el
@@ -33,6 +33,9 @@
 ;;              sense. But fetching the packages is still the hard part.
 ;;
 
+;; Make sure we start the server?
+;;
+(server-start)
 
 ;; =================================================================
 ;; Various bits of path setup (init-dir is defined by init.el)
@@ -234,7 +237,7 @@
 (require 'filladapt)
 (setq-default filladapt-mode t)
 
-;; Also, ido mode. Which is the BEST thing. Really.
+;; We're going to stop doing ido and start doing helm, maybe?
 (require 'ido)
 
 ;; =================================================================
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 5371837..4d1abfc 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -43,6 +43,8 @@
  '(transient-mark-mode t)
  '(truncate-lines t)
  '(use-dialog-box nil)
+ '(web-mode-code-indent-offset 2)
+ '(web-mode-css-indent-offset 2)
  '(which-func-mode-global t nil (which-func))
  '(widget-editable-list-gui t)
  '(x-stretch-cursor nil))
diff --git a/.gitconfig b/.gitconfig
index 0f6c22c..80ab3ec 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,7 +2,6 @@
 	name = John Doty
 	email = john@d0ty.me
 [core]
-	editor = c:/chocolatey/bin/emacs.bat
 	autocrlf = true
 [pretty]
 	doty = * %C(bold green)%h%Creset -%C(bold white)%d%Creset %s %C(bold)(%cr)%Creset <%aN>%Creset