+
+(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" ))
-;(load-theme 'tango-dark)
-
-(display-time-mode 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)
-
-(setq ns-use-srgb-colorspace nil)
-(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
-(fringe-mode 0)
-
-;
-;;; Set symbol for the border
-(set-display-table-slot standard-display-table
- 'vertical-border
- (make-glyph-code ?┃))
-
-;;---------------------------------------------------------------------------------------
-;; package
-;; http://y.tsutsumi.io/emacs-from-scratch-part-2-package-management.html
-;;
-(require 'package)
-(add-to-list 'package-archives
- '("melpa" . "http://melpa.milkbox.net/packages/") t)
-(package-initialize)
-
-(defvar required-packages
- '(
- magit
- helm
- ido-ubiquitous
- yasnippet
- evil
- ido-vertical-mode
- smex
- color-theme
- color-theme-sanityinc-tomorrow
- key-chord
- powerline-evil
- powerline
- evil-leader
- flx-ido
- flx
- auto-complete
- fiplr
- w3m
- ace-jump-mode
-; el-get
- color-identifiers-mode
- elscreen
- moe-theme
- monokai-theme
- molokai-theme
-; tangotango-theme
- cyberpunk-theme
- ) "a list of packages to ensure are installed at launch.")
-
-(require 'cl)
-(defun packages-installed-p ()
- (loop for p in required-packages
- when (not (package-installed-p p)) do (return nil)
- finally (return t)))
-
-(unless (packages-installed-p)
- (message "%s" "Emacs is now refreshing its package database...")
- (package-refresh-contents)
- (message "%s" " done.")
- (dolist (p required-packages)
- (when (not (package-installed-p p))
- (package-install p))))
-
-;---------------------------------------------------------------------------------------
-;; 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")
-;(setq magit-auto-revert-mode nil)
+(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)
-;;---------------------------------------------------------------------------------------
-;; evil
-;;
-(global-evil-leader-mode)
-(evil-leader/set-leader ";")
-(evil-leader/set-key "e" 'find-file)
-(evil-leader/set-key "b" 'switch-to-buffer)
-(evil-leader/set-key "w" 'evil-write)
-(require 'evil)
-;(setq key-chord-two-keys-delay 0.5)
-(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
-(key-chord-mode 1)
-
-;; cursor shape
-(setq evil-emacs-state-cursor '("red" box))
-(setq evil-normal-state-cursor '("green" box))
-(setq evil-visual-state-cursor '("orange" box))
-(setq evil-insert-state-cursor '("red" bar))
-(setq evil-replace-state-cursor '("red" bar))
-(setq evil-operator-state-cursor '("red" hollow))
-;;Enter an emacs mode in a given state http://wikemacs.org/wiki/Evil
-(loop for (mode . state) in '(
-; (inferior-emacs-lisp-mode . emacs)
-; (nrepl-mode . insert)
-; (pylookup-mode . emacs)
-; (comint-mode . normal)
-; (shell-mode . emacs)
-; (git-commit-mode . insert)
-; (git-rebase-mode . emacs)
-; (term-mode . emacs)
-; (help-mode . emacs)
-; (helm-grep-mode . emacs)
-; (grep-mode . emacs)
-; (bc-menu-mode . emacs)
-; (magit-branch-manager-mode . emacs)
-; (rdictcc-buffer-mode . emacs)
-; (dired-mode . emacs)
-; (wdired-mode . normal)
- (eshell-mode . emacs))
- do (evil-set-initial-state mode state))
-
-;(evil-mode 1)
-
-;;---------------------------------------------------------------------------------------
-;; 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" ".*" ))))
+(require 'my-packages)
-(global-set-key (kbd "C-x f") 'fiplr-find-file)
+(require 'init-color-theme)
+;(require 'init-ido)
+(require 'init-magit)
+(require 'init-evil)
+(require 'init-project)
+(require 'init-ggtags)
-;;---------------------------------------------------------------------------------------
-;; Wind-move
-;;
-(global-set-key (kbd "C-x C-l") 'windmove-right)
-(global-set-key (kbd "C-x C-h") 'windmove-left)
-(global-set-key (kbd "C-x C-k") 'windmove-up)
-(global-set-key (kbd "C-x C-j") 'windmove-down)
+;;;; 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)
-;;---------------------------------------------------------------------------------------
-;; Wind-move
-;;
-(set-face-attribute 'vertical-border nil :foreground "gray")
-
-;(add-to-list 'load-path "~/.emacs.d/config")
-;(require 'init-color-theme)
-
-
-;;;(defun color-theme-inkpot ()
-;;; "Color theme based on the Inkpot theme. Ported and tweaked by Per Vognsen."
-;;; (interactive)
-;;; (color-theme-install
-;;; '(color-theme-inkpot
-;;; ((foreground-color . "#cfbfad")
-;;; (background-color . "#1e1e27")
-;;; (border-color . "#3e3e5e")
-;;; (cursor-color . "#404040")
-;;; (background-mode . dark))
-;;; (region ((t (:background "#404040"))))
-;;; (highlight ((t (:background "#404040"))))
-;;; (fringe ((t (:background "#16161b"))))
-;;; (show-paren-match-face ((t (:background "#606060"))))
-;;; (isearch ((t (:bold t :foreground "#303030" :background "#cd8b60"))))
-;;; (modeline ((t (:bold t :foreground "#b9b9b9" :background "#3e3e5e"))))
-;;; (modeline-inactive ((t (:foreground "#708090" :background "#3e3e5e"))))
-;;; (modeline-buffer-id ((t (:bold t :foreground "#b9b9b9" :background "#3e3e5e"))))
-;;; (minibuffer-prompt ((t (:bold t :foreground "#708090"))))
-;;; (font-lock-builtin-face ((t (:foreground "#c080d0"))))
-;;; (font-lock-comment-face ((t (:foreground "#708090")))) ; original inkpot: #cd8b00
-;;; (font-lock-constant-face ((t (:foreground "#506dbd"))))
-;;; (font-lock-doc-face ((t (:foreground "#cd8b00"))))
-;;; (font-lock-function-name-face ((t (:foreground "#87cefa"))))
-;;; (font-lock-keyword-face ((t (:bold t :foreground "#c080d0"))))
-;;; (font-lock-preprocessor-face ((t (:foreground "309090"))))
-;;; (font-lock-reference-face ((t (:bold t :foreground "#808bed"))))
-;;; (font-lock-string-face ((t (:foreground "#ffcd8b" :background "#404040"))))
-;;; (font-lock-type-face ((t (:foreground "#ff8bff"))))
-;;; (font-lock-variable-name-face ((t nil)))
-;;; (font-lock-warning-face ((t (:foreground "#ffffff" :background "#ff0000"))))))
-
-
-(require 'color-theme)
-
-
-;;---------------------------------------------------------------------------------------
-;; El-get
-;; https://github.com/dimitri/el-get
-;;
+;; 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)
+
+;(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 'init-helm)
+
+;; page break configuration
+;(require 'pp-c-l)
+;(pretty-control-l-mode 1)
-(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
+;; persist command history of helm
+;(require 'session)
+;(add-hook 'after-init-hook 'session-initialize)
-(unless (require 'el-get nil 'noerror)
- (with-current-buffer
- (url-retrieve-synchronously
- "https://raw.githubusercontent.com/dimitri/el-get/master/el-get-install.el")
- (goto-char (point-max))
- (eval-print-last-sexp)))
-(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-user/recipes")
+(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)))
-(el-get-bundle seudut/color-theme-tangotango
-; :features color-theme-tangotango
-; (color-theme-tangotango)
- )
+;;(savehist-mode)
+;; (setq history-length 1000
+;; history-delete-duplicates t
+;; savehist-additional-variables '(extended-command-history))
-
+; (setq split-height-threshold 0)
-;(require 'color-theme-tangotango)
-;(color-theme-tangotango)
-;;---------------------------------------------------------------------------------------
-;; color theme
+;;;(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 'icicles)
+;(icy-mode 1)
+
+
+;(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 'color-theme)
-;;; this color theme no bold style
-;(load-theme 'sanityinc-tomorrow-night t)
-;(load-theme 'sanityinc-tomorrow-bright t)
-;; this theme no italic for comment
-;(load-theme 'tangotango t)
-;(load-theme 'cyberpunk t)
+;(require 'init-keychord)
-;(require 'moe-theme)
-;(moe-dark)
+;(setq hydra-examples-verbatim t)
+(require 'init-hydra)
-(add-to-list 'custom-theme-load-path "~/.emacs.d/el-get/color-theme-tangotango")
-(load-theme 'tangotango t)
+;(require 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)
-;(require 'powerline)
-;(powerline-default-theme)
+(require 'init-multi-term)
+(require 'init-projectile)
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
-;(add-to-list 'load-path "~/.emacs.d/vendor/emacs-powerline")
-;(require 'powerline)
-;(powerline-default-theme)
+;(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/config")
-(require 'init-color-theme)
-;(color-theme-inkpot)
-;(require 'color-theme-tangotango)
-;(color-theme-tangotango)
+(require 'dired+)
projects / dotfiles.git / blobdiff