3 ;; Added by Package.el. This must come before configurations of
4 ;; installed packages. Don't delete this line. If you don't want it,
5 ;; just comment it out by adding a semicolon to the start of the line.
6 ;; You may delete these explanatory comments.
9 (setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
10 (setq exec-path (append exec-path '("/usr/local/bin")))
15 (setq debug-on-error t)
18 (add-to-list 'load-path "~/.emacs.d/config")
20 ;; remove custom setting out of init.el
21 ;; http://emacsblog.org/2008/12/06/quick-tip-detaching-the-custom-file/
22 (setq custom-file "~/.emacs.d/custom.el")
23 (load custom-file 'noerror)
26 (require 'my-packages)
30 ;(require 'init-color-theme)
31 (require 'init-color-theme-2)
35 (require 'init-project)
36 (require 'init-ggtags)
39 ;;;; conflict with C-c . in org-mode, disable it temporarily
40 ;;;;(require 'init-c-cpp)
41 ;(require 'init-key-binding)
42 (require 'init-winner)
43 (require 'init-minibuffer)
44 (require 'init-eshell)
46 ;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
47 ;;;(ac-linum-workaround)
50 ;(require 'init-mode-line)
51 ;(require 'init-workgroup2)
54 ;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
57 ;(require 'init-linum)
59 (require 'auto-complete)
60 (require 'auto-complete-config)
66 ;; page break configuration
68 ;(pretty-control-l-mode 1)
70 ;; persist command history of helm
72 ;(add-hook 'after-init-hook 'session-initialize)
75 (require 'use-package)
77 ;; persist command history of helm
81 (setq history-length 1000
82 history-delete-duplicates t
83 savehist-additional-variables '(extended-command-history)))
86 ;; (setq history-length 1000
87 ;; history-delete-duplicates t
88 ;; savehist-additional-variables '(extended-command-history))
90 ; (setq split-height-threshold 0)
96 ;;;(require 'helm-gtags)
97 ;;;;(require 'setup-helm-gtags)
98 ;;;;(helm-gtags-mode 1)
99 ;;;;;; Enable helm-gtags-mode
100 ;;;(add-hook 'c-mode-hook 'helm-gtags-mode)
101 ;;;(add-hook 'c++-mode-hook 'helm-gtags-mode)
102 ;;;(add-hook 'asm-mode-hook 'helm-gtags-mode)
105 ;;;(custom-set-variables
106 ;;; '(helm-gtags-path-style 'relative)
107 ;;; '(helm-gtags-ignore-case t)
108 ;;; '(helm-gtags-auto-update t))
111 ;;;(eval-after-load "helm-gtags"
113 ;;; (define-key helm-gtags-mode-map (kbd "M-t") 'helm-gtags-find-tag)
114 ;;; (define-key helm-gtags-mode-map (kbd "M-r") 'helm-gtags-find-rtag)
115 ;;; (define-key helm-gtags-mode-map (kbd "M-s") 'helm-gtags-find-symbol)
116 ;;; (define-key helm-gtags-mode-map (kbd "M-g M-p") 'helm-gtags-parse-file)
117 ;;; (define-key helm-gtags-mode-map (kbd "C-c <") 'helm-gtags-previous-history)
118 ;;; (define-key helm-gtags-mode-map (kbd "C-c >") 'helm-gtags-next-history)
119 ;;; (define-key helm-gtags-mode-map (kbd "M-,") 'helm-gtags-pop-stack)))
127 (setq help-window-select t)
131 ;(require 'init-keychord)
133 ;(setq hydra-examples-verbatim t)
134 (require 'init-hydra)
137 ;(require 'ace-window)
138 ;(global-set-key (kbd "M-p") 'ace-window)
141 (require 'init-multi-term)
142 ;(require 'init-projectile)
144 (require 'page-break-lines)
145 ;(turn-on-page-break-lines-mode)
146 (global-page-break-lines-mode 1)
148 ;(setq projectile-completion-system 'helm)
149 ;(helm-projectile-on)
152 ;; show projectile name in mode-line
155 (if (locate-library "ediff")
157 (autoload 'ediff-files "ediff")
158 (autoload 'ediff-buffers "ediff")
160 (eval-after-load "ediff" '(progn
161 (message "doing ediff customisation")
162 (setq diff-switches "-u"
163 ediff-custom-diff-options "-U3"
164 ediff-split-window-function 'split-window-horizontally
165 ediff-window-setup-function 'ediff-setup-windows-plain)
167 (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display)
168 (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display)
169 (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display)))))
173 (defun update-diff-colors ()
174 "update the colors for diff faces"
175 (set-face-attribute 'diff-added nil
176 :foreground "white" :background "blue")
177 (set-face-attribute 'diff-removed nil
178 :foreground "white" :background "red3")
179 (set-face-attribute 'diff-changed nil
180 :foreground "white" :background "purple"))
181 (eval-after-load "diff-mode"
182 '(update-diff-colors))
192 (fringe-mode (quote (0 . 0)))