X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=813f41a2555716f258a53f4a48580415940913b0;hb=4e8f8c61c4be30fef35b79795a3f74eb1cfcc122;hp=99e760a1da2cdfd4741ffdd4791ce7e5fe6f52ba;hpb=d93b3fdb88d07c3b45678649283f33462e7fb13a;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 99e760a..813f41a 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,49 +1,8 @@
-;;;(if (eq system-type 'darwin)
-;;;  (setenv "PATH"
-;;;)   (concat (getenv "path") ":/usr/local/bin:~/bin/")
-;;;  )
 
+;; 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)
 
-(setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
-(setq exec-path (append exec-path '("/usr/local/bin")))
-
-(setq debug-on-error t)
-
-
-(add-to-list 'load-path "~/.emacs.d/config")
-
-(require 'init-base)
-
-(require 'my-packages)
-
-(require 'init-color-theme)
-(require 'init-ido)
-(require 'init-magit)
-(require 'init-evil)
-(require 'init-project)
-(require 'init-ggtags)
-
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
-
-
-;;;; conflict with C-c . in org-mode, disable it temporarily
-;;;;(require 'init-c-cpp)
-(require 'init-key-binding)
-(require 'init-winner)
-(require 'init-minibuffer)
-
-
-;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
-;;;(ac-linum-workaround)
-
-
-(require 'init-mode-line)
-(require 'init-workgroup2)
-(require 'init-perl)
-
-;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
-;(load "pde-load")                       ;
-
-(require 'init-linum)
+(org-babel-load-file "~/.emacs.d/config.org")