X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=2afcacab32d64c4502131930dd8c90cc10882cad;hb=0118b4f852d46086bd4c001425538dbb0644a106;hp=fc521fbe0f65dfb9c4ba77f495f0bcdeee93663e;hpb=16e93b23ce9b8bf9a9ed04181f8bbf6ff03b16c0;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index fc521fb..2afcaca 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -7,6 +7,10 @@
 
 (add-to-list 'load-path "~/.emacs.d/config")
 
+;; remove custom setting out of init.el
+;; http://emacsblog.org/2008/12/06/quick-tip-detaching-the-custom-file/
+(setq custom-file "~/.emacs.d/custom.el")
+(load custom-file 'noerror)
 
 (require 'init-base)
 (require 'init-font)
@@ -20,24 +24,20 @@
 (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)
-
+(require 'init-eshell)
 
 ;; 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-workgroup2)
 (require 'init-perl)
 
 ;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
@@ -129,8 +129,62 @@
 ;(require 'init-keychord)
 
 ;(setq hydra-examples-verbatim t)
-;(require 'init-hydra)
+(require 'init-hydra)
 
 
 ;(require 'ace-window)
 ;(global-set-key (kbd "M-p") 'ace-window)
+
+
+(require 'init-multi-term)
+(require 'init-projectile)
+
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
+
+;(setq projectile-completion-system 'helm)
+;(helm-projectile-on)
+
+
+;; show projectile name in mode-line
+
+
+(if (locate-library "ediff")
+    (progn
+      (autoload 'ediff-files "ediff")
+      (autoload 'ediff-buffers "ediff")
+
+       (eval-after-load "ediff" '(progn
+  			  (message "doing ediff customisation")
+			  (setq diff-switches               "-u"
+				ediff-custom-diff-options   "-U3"
+				ediff-split-window-function 'split-window-horizontally
+				ediff-window-setup-function 'ediff-setup-windows-plain)
+
+			  (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display)
+			  (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display)
+			  (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display)))))
+
+
+
+(defun update-diff-colors ()
+  "update the colors for diff faces"
+  (set-face-attribute 'diff-added nil
+                      :foreground "white" :background "blue")
+  (set-face-attribute 'diff-removed nil
+                      :foreground "white" :background "red3")
+  (set-face-attribute 'diff-changed nil
+                      :foreground "white" :background "purple"))
+(eval-after-load "diff-mode"
+  '(update-diff-colors))
+
+
+
+(require 'helm-ag)
+(require 'flx)
+(flx-ido-mode t)
+
+
+
+(require 'dired+)