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

diff --git a/emacs.d/init.el b/emacs.d/init.el
index ca3d88c..a4f9ddc 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,287 +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)
-
-(scroll-bar-mode -1)
-(tool-bar-mode -1)
-;(menu-bar-mode -1)
-(add-to-list 'default-frame-alist '(width  . 120))
-(add-to-list 'default-frame-alist '(height . 40))
-;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12:weight:light" ))
-(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" ))
-(setq inhibit-startup-message t)
-
-(put 'set-goal-column 'disabled nil)
-(setq vc-follow-symlinks t)
-(setq visible-bell 1)
-(setq ring-bell-function 'ignore)
-(setq resize-mini-windows t)
-(blink-cursor-mode 0)
-
-
-(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
 
 
 
-;;; Set symbol for the border
-(set-display-table-slot standard-display-table
-                        'vertical-border 
-                        (make-glyph-code ?┃))
-
-(set-face-attribute 'vertical-border nil  :foreground "gray")
+(setq debug-on-error t)
 
 
 (add-to-list 'load-path "~/.emacs.d/config")
-(require 'my-packages)
-
-;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
-;(elscreen-start)
-;(require 'init-elscreen)
-;(require 'elscreen)
-;(custom-set-faces
-; '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black"))))
-; '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black")))))
-
-
-(require 'init-color-theme)
-
-
-;---------------------------------------------------------------------------------------
-;; Ido
-;;
-(require 'ido-vertical-mode)
-(ido-vertical-mode 1)
-(require 'flx-ido)
-(ido-mode 1)
-(ido-everywhere 1)
-(flx-ido-mode 1)
-(setq ido-use-faces nil)
-
-(setq org-completion-use-ido t)
-(setq magit-completing-read-function 'magit-ido-completing-read)
-
-(require 'ido-ubiquitous)
-(ido-ubiquitous-mode 1)
-
-;; smex
-(require 'smex) 
-(global-set-key (kbd "M-x") 'smex)
-(global-set-key (kbd "M-X") 'smex-major-mode-commands)
-
-;;---------------------------------------------------------------------------------------
-;; Magit
-;;
-(require 'magit)
-(setq magit-last-seen-setup-instructions "1.4.0")
-(global-set-key (kbd "C-x g") 'magit-status)
-;(setq magit-auto-revert-mode nil)
-
-
-(require 'init-evil)
-
 
+;; 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)
 
-;;---------------------------------------------------------------------------------------
-;; Fiplr
-;;
-(setq fiplr-root-markers '(".git" ".svn" "*.DS_Store"))
-(setq fiplr-ignored-globs '((directories (".git" ".svn"))
-                            (files ("*.jpg" "*.png" "*.zip" "*~" "*.o" ".obj" "*.swp" "*.hg" ".pyc" ".*" ))))
-
-(global-set-key (kbd "C-x f") 'fiplr-find-file)
-
-
-;;---------------------------------------------------------------------------------------
-;; sr-speedbar
-;;
-;(require 'sr-speedbar)
-;(setq speedbar-use-images nil)
-;(setq speedbar-show-unknown-files t)
-
-
-
-
-(require 'projectile)
-(projectile-global-mode)
-(setq projectile-enable-caching t)
-(require 'projectile-speedbar)
-
-;(require 'cc-mode)
-;(require 'ecb)
-
-;(setq ecb-layout-name "leftright3")
-
-;; gnu global support
-;(require 'semantic/db)
-;(global-semanticdb-minor-mode 1)
 
+(require 'my-packages)
+(require 'init-base)
+(require 'init-font)
+
+;(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)
-
-
-(require 'init-c-cpp)
-
-(require 'recentf)
-(recentf-mode 1)
-(setq recentf-max-menu-items 100)
-
+;;;; 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 'recentf-ext)
-
-(require 'init-key-binding)
-
-(winner-mode 1)
-
-(global-set-key (kbd "C-c C-l") 'winner-redo)
-(global-set-key (kbd "C-c C-h") 'winner-undo)
+;; 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)
 
-;(require 'minibuffer-tray)
-;(require 'eyebrowse)
-;(eyebrowse-mode t)
+;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
+;(load "pde-load")                       ;
 
+;(require 'init-linum)
 
+(require 'auto-complete)
+(require 'auto-complete-config)
+(ac-config-default)
 
-;;(require 'minibuffer-line)
-;(minibuffer-line-mode 1)
 
+;(require 'init-helm)
 
-;(add-to-list 'load-path "~/.emacs.d/vendor")
-;(require 'minibuffer-tray)
-;(minibuffer-tray-mode 1)
-;(require 'xwem-minibuffer)
+;; page break configuration
+;(require 'pp-c-l)
+;(pretty-control-l-mode 1)
 
-; (run-at-time
-;  nil 30
-;  (lambda ()
-;    (with-current-buffer " *Minibuf-0*"
-;      (erase-buffer)
-;      (dotimes (spaces (- (frame-width) 20))
-;        (insert " "))
-;      (insert (format-time-string "%m-%d  %I:%M %p %a ")))))
+;; persist command history of helm
+;(require 'session)
+;(add-hook 'after-init-hook 'session-initialize)
 
 
+(require 'use-package)
 
+;; 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))) 
 
-;;; 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))))
+;;(savehist-mode)
+;;  (setq history-length 1000
+;;        history-delete-duplicates t
+;;        savehist-additional-variables '(extended-command-history)) 
 
+;    (setq split-height-threshold 0)
 
 
-(add-hook 'minibuffer-setup-hook
-          (lambda ()
-            (make-local-variable 'face-remapping-alist)
-            (add-to-list 'face-remapping-alist '(default (:background "green")))))
 
 
 
+;;;(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)))
 
-(require 'evil-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)
 
+;(require 'icicles)
+;(icy-mode 1)
 
-;; ---------------
-;; recent file
-(require 'recentf)
-(recentf-mode)
-;(setq recentf-max-menu-items 100)
 
-;; 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-org)
+(setq help-window-select t)
 
 
 
-;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
-(ac-linum-workaround)
+;(require 'init-keychord)
 
+;(setq hydra-examples-verbatim t)
+(require 'init-hydra)
 
-;; ---------------------------------
-;; linum-relative
 
-(require 'linum-relative)
+;(require 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)
 
-(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))
- '(org-agenda-files (quote ("~/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)))))
+(require 'init-multi-term)
+;(require 'init-projectile)
 
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
 
-;; enable linum-relative in programming mode
-;https://github.com/howardabrams/dot-files/blob/master/emacs.org
-(add-hook 'prog-mode-hook 'linum-mode)
+;(setq projectile-completion-system 'helm)
+;(helm-projectile-on)
 
 
-;; hight current line
-(require 'highlight-current-line)
-(highlight-current-line-on t)
+;; show projectile name in mode-line
 
 
+(if (locate-library "ediff")
+    (progn
+      (autoload 'ediff-files "ediff")
+      (autoload 'ediff-buffers "ediff")
 
-;(defun pl-fringe-mode ()
-;  "jfoewoif"
-;  (if linum-mode
-;      (fringe-mode '(4 . 0))
-;    (fringe-mode '(0 . 0))))
+       (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)))))
 
-;(add-hook 'eshell-mode-hook 'pl-fringe-mode)
-;(add-hook 'prog-mode-hook 'pl-fringe-mode)
 
 
+(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 'workgroups2)
+;(require 'helm-ag)
+;(require 'flx)
+;(flx-ido-mode t)
 
 
-(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)
 
+(fringe-mode (quote (0 . 0)))