Merge remote-tracking branch 'refs/remotes/origin/master'

1 files changed, 27 insertions, 4 deletions

diff --git a/init.el b/init.el
index 0f1a305..78c1b87 100644
--- a/init.el
+++ b/init.el
@@ -1,7 +1,27 @@
-;; 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.
+;;; init.el --- initialize emacs configuration
+
+;;; Author: Benj Bellon <benjaminbellon@gmail.com>
+;;; Maintainer: Benj Bellon <benjaminbellon@gmail.com>
+;;; Homepage: https://github.com/benjbellon/emacs.d
+;;; Keywords: emacs, emacs.d, config
+
+;;; Commentary:
+
+;;; This config builds an instance of Emacs personalized for its author.
+;;; A few things of interest:
+;;; 1. C-x C-c is overriden in the GUI so it redirects to the default
+;;;    *ansi-term* buffer. If you wish for this override while using
+;;;    Emacs in terminal mode, provide the following ENV variable:
+;;;      EMACS_OVERRIDE_C_X_C_C
+;;;
+;;; 2. init.el calls keychain-refresh-environment. If for some reason,
+;;;    you do not wish for the following to be available to Emacs, add
+;;;    a comment or remove the call:
+;;;        SSH_AUTH_SOCK
+;;;        SSH_AGENT_PID
+;;;        GPG_AGENT_INFO
+;;;
+;;; Code:
 (package-initialize)
 
 ;; Suppress splash screen
@@ -75,6 +95,7 @@
 
 (add-to-list 'exec-path "/usr/local/bin")
 
+(require 'setup-auto-insert-mode)
 (require 'setup-c++-mode)
 (require 'setup-clojure-mode)
 (require 'setup-ember-mode)
@@ -82,6 +103,7 @@
 (require 'setup-flycheck)
 (require 'setup-haskell-mode)
 (require 'setup-ido)
+(require 'setup-keychain-environment)
 (require 'setup-magit)
 (require 'setup-markdown-mode)
 (require 'setup-multiple-cursors)
@@ -101,4 +123,5 @@
 (put 'upcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
 
+(keychain-refresh-environment)
 ;;; init.el ends here