-;;;(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")
-(global-set-key "\C-s" 'isearch-forward-regexp)
-(global-set-key "\C-r" 'isearch-backward-regexp)
+;; 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)
(require 'my-packages)
+(require 'init-base)
+(require 'init-font)
-(require 'init-color-theme)
+;(require 'init-color-theme)
+(require 'init-color-theme-2)
;(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-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-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)
+;(require 'init-linum)
(require 'auto-complete)
(require 'auto-complete-config)
(ac-config-default)
-(require 'init-helm)
+;(require 'init-helm)
;; page break configuration
;(require 'pp-c-l)
;(icy-mode 1)
-(require 'init-org)
+;(require 'init-org)
(setq help-window-select t)
- (add-to-list 'load-path "~/.emacs.d/site-lisp/eim")
- (autoload 'eim-use-package "eim" "Another emacs input method")
-
- (register-input-method
- "eim-wb" "euc-cn" 'eim-use-package
- "五笔" "汉字五笔输入法" "~/.emacs.d/site-lisp/eim/wb.txt")
- (register-input-method
- "eim-py" "euc-cn" 'eim-use-package
- "拼音" "汉字拼音输入法" "~/.emacs.d/site-lisp/eim/py.txt")
;(require 'init-keychord)
+
+;(setq hydra-examples-verbatim t)
+(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)
+
+
+
+(fringe-mode (quote (0 . 0)))
projects / dotfiles.git / blobdiff