X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=a4f9ddc39e63bbbf4eb9e08a4f327611c5477a4b;hb=1ba7230f88e8a6c2290e3bca3e6e353457569055;hp=fc7fee96c4a1603914ad327b9a7c52ad63285472;hpb=1508bdd3e5e0117394d06787e4d8b9c9febacf73;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index fc7fee9..a4f9ddc 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,215 +1,192 @@
-;;;(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)
+;; 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 '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)
 
-(require 'init-ido)
 
-(require 'init-magit)
+;;;; 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)
 
-(require 'init-evil)
+;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
+;;;(ac-linum-workaround)
 
-(require 'init-project)
 
-(require 'projectile-speedbar)
+;(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-ggtags)
+;(require 'init-linum)
 
+(require 'auto-complete)
+(require 'auto-complete-config)
+(ac-config-default)
 
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
 
+;(require 'init-helm)
 
-(require 'init-c-cpp)
+;; page break configuration
+;(require 'pp-c-l)
+;(pretty-control-l-mode 1)
 
-(require 'recentf)
-(recentf-mode 1)
-(setq recentf-max-menu-items 100)
+;; persist command history of helm
+;(require 'session)
+;(add-hook 'after-init-hook 'session-initialize)
 
 
-(require 'recentf-ext)
+(require 'use-package)
 
-(require 'init-key-binding)
+;; persist command history of helm
+(use-package savehist
+  :init (savehist-mode)
+  :config
+  (setq history-length 1000
+        history-delete-duplicates t
+        savehist-additional-variables '(extended-command-history))) 
 
-(winner-mode 1)
+;;(savehist-mode)
+;;  (setq history-length 1000
+;;        history-delete-duplicates t
+;;        savehist-additional-variables '(extended-command-history)) 
 
-(global-set-key (kbd "C-c C-l") 'winner-redo)
-(global-set-key (kbd "C-c C-h") 'winner-undo)
+;    (setq split-height-threshold 0)
 
 
 
 
 
+;;;(require 'helm-gtags)
+;;;;(require 'setup-helm-gtags)
+;;;;(helm-gtags-mode 1)
+;;;;;; Enable helm-gtags-mode
+;;;(add-hook 'c-mode-hook 'helm-gtags-mode)
+;;;(add-hook 'c++-mode-hook 'helm-gtags-mode)
+;;;(add-hook 'asm-mode-hook 'helm-gtags-mode)
+;;;
+;;;;; customize
+;;;(custom-set-variables
+;;; '(helm-gtags-path-style 'relative)
+;;; '(helm-gtags-ignore-case t)
+;;; '(helm-gtags-auto-update t))
+;;;
+;;;;; key bindings
+;;;(eval-after-load "helm-gtags"
+;;;  '(progn
+;;;     (define-key helm-gtags-mode-map (kbd "M-t") 'helm-gtags-find-tag)
+;;;     (define-key helm-gtags-mode-map (kbd "M-r") 'helm-gtags-find-rtag)
+;;;     (define-key helm-gtags-mode-map (kbd "M-s") 'helm-gtags-find-symbol)
+;;;     (define-key helm-gtags-mode-map (kbd "M-g M-p") 'helm-gtags-parse-file)
+;;;     (define-key helm-gtags-mode-map (kbd "C-c <") 'helm-gtags-previous-history)
+;;;     (define-key helm-gtags-mode-map (kbd "C-c >") 'helm-gtags-next-history)
+;;;     (define-key helm-gtags-mode-map (kbd "M-,") 'helm-gtags-pop-stack)))
 
-;;; set font size of minibuffer
-;;;; http://stackoverflow.com/questions/7869429/altering-the-font-size-for-the-emacs-minibuffer-separately-from-default-emacs
-(add-hook 'minibuffer-setup-hook 'my-minibuffer-setup)
-(defun my-minibuffer-setup ()
-       (set (make-local-variable 'face-remapping-alist)
-          '((default :height 120))))
 
+;(require 'icicles)
+;(icy-mode 1)
 
 
-(add-hook 'minibuffer-setup-hook
-          (lambda ()
-            (make-local-variable 'face-remapping-alist)
-            (add-to-list 'face-remapping-alist '(default (:background "green")))))
+;(require 'init-org)
+(setq help-window-select t)
 
 
 
+;(require 'init-keychord)
 
-;;;;;(require 'escape)
-;(setq-default evil-escape-delay 0.2)	
-;(setq evil-escape-excluded-major-modes '(dired-mode))
-;(setq-default evil-escape-key-sequence "jj")
-;(evil-escape-mode 1)
+;(setq hydra-examples-verbatim t)
+(require 'init-hydra)
 
 
-;; ---------------
-;; recent file
-(require 'recentf)
-(recentf-mode)
-;(setq recentf-max-menu-items 100)
+;(require 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)
 
-;; http://www.emacswiki.org/emacs/RecentFiles
-(defun recentf-ido-find-file ()
-  "Find a recent file using Ido."
-  (interactive)
-  (let ((file (ido-completing-read "Choose recent file: " recentf-list nil t)))
-    (when file
-      (find-file file))))
 
+(require 'init-multi-term)
+;(require 'init-projectile)
 
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
 
-;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
-(ac-linum-workaround)
-
-
-;; ---------------------------------
-;; linum-relative
-
-
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(fringe-mode (quote (4 . 0)) nil (fringe))
- '(ggtags-split-window-function (quote split-window-vertically))
- '(hes-mode-alist
-   (quote
-    ((c-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (cperl-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (c++-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (objc-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
-     (java-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|u[[:xdigit:]]\\{4\\}\\|[\"'\\bfnrt]\\)\\)")
-     (js-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)")
-     (js2-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)")
-     (ruby-mode
-      ("\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{1,2\\}\\|u\\(?:[[:xdigit:]]\\{4\\}\\|{[[:xdigit:]]\\{1,6\\}\\(?:[[:space:]]+[[:xdigit:]]\\{1,6\\}\\)*}\\)\\|.\\)\\)"
-       (0
-        (let*
-            ((state
-              (syntax-ppss))
-             (term
-              (nth 3 state)))
-          (when
-              (or
-               (and
-                (eq term 39)
-                (member
-                 (match-string 2)
-                 (quote
-                  ("\\" "'"))))
-               (if
-                   (fboundp
-                    (quote ruby-syntax-expansion-allowed-p))
-                   (ruby-syntax-expansion-allowed-p state)
-                 (memq term
-                       (quote
-                        (34 47 10 96 t)))))
-            (add-face-text-property
-             (match-beginning 1)
-             (match-end 1)
-             (quote hes-escape-backslash-face))
-            (add-face-text-property
-             (match-beginning 2)
-             (match-end 2)
-             (quote hes-escape-sequence-face))
-            nil))
-        prepend))))))
- '(org-agenda-files (quote ("~/Private/org/diary.org" "~/temp/org-note.org")))
- '(powerline-text-scale-factor 0.85))
-
-;; maybe better to fix the size of line number rather scaled 0.8
-;; https://github.com/howardabrams/dot-files/blob/master/emacs.org
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(highlight-current-line-face ((t (:background "gray22"))))
- '(linum ((t (:background "#000000" :foreground "gray40" :height 0.8 :slant italic :weigth light))))
- '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8))))
- '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :family "Source Code Pro for Powerline" :height 100))))
- '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil :family "Source Code Pro for Powerline" :height 100)))))
-
-
-;; enable linum-relative in programming mode
-;https://github.com/howardabrams/dot-files/blob/master/emacs.org
-(add-hook 'prog-mode-hook 'linum-mode)
-
-
-;; hight current line
-(require 'highlight-current-line)
-(highlight-current-line-on t)
-
-
-
-
-(require 'workgroups2)
-
-
-(setq wg-prefix-key (kbd "C-c z"))
-(setq wg-session-file "~/.emacs.d/.emacs_workgroups")
-(setq wg-mode-line-display-on t)          ; Default: (not (featurep 'powerline))
-(setq wg-flag-modified t)                 ; Display modified flags as well
-(setq wg-mode-line-decor-left-brace "["
-      wg-mode-line-decor-right-brace "]"  ; how to surround it
-      wg-mode-line-decor-divider ":")
-;(workgroups-mode 1)
-
-(defalias 'perl-mode 'cperl-mode)
-;(setq cperl-invalid-face nil)
- (setq cperl-invalid-face (quote off))
-;(add-hook 'prog-mode-hook '(lambda () 
-;        (highlight-regexp "%[[:alpha:]]\\|\\\\[[:alpha:]]")))
-
-(require 'highlight-escape-sequences)
-(hes-mode)
-;(setq cperl-font-lock t)
-(put 'hes-escape-backslash-face 'face-alias 'font-lock-builtin-face)
-(put 'hes-escape-sequence-face 'face-alias 'font-lock-builtin-face)
+;(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)
 
 
-;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
-;(load "pde-load")                       ;
 
-(require 'init-linum)
+(fringe-mode (quote (0 . 0)))