-(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" ))
+;; 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)
-(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)
+(setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
+(setq exec-path (append exec-path '("/usr/local/bin")))
-(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
-(fringe-mode 0)
+(setq debug-on-error t)
-;;; 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")
+(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)
-(add-to-list 'load-path "~/.emacs.d/config")
(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)
+
+
+;;;; 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)
+
+;; 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)
+
+;; 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)))
+
+;;(savehist-mode)
+;; (setq history-length 1000
+;; history-delete-duplicates t
+;; savehist-additional-variables '(extended-command-history))
+
+; (setq split-height-threshold 0)
+
+
+
+
-;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
-(elscreen-start)
-(require 'init-elscreen)
-(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)
+;;;(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)))
-(setq org-completion-use-ido t)
-(setq magit-completing-read-function 'magit-ido-completing-read)
-(require 'ido-ubiquitous)
-(ido-ubiquitous-mode 1)
+;(require 'icicles)
+;(icy-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)
+;(require 'init-org)
+(setq help-window-select t)
+;(require 'init-keychord)
-;;---------------------------------------------------------------------------------------
-;; 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)
+;(setq hydra-examples-verbatim t)
+(require 'init-hydra)
-;; 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)
-; (wdired-mode . normal)
- (eshell-mode . emacs))
- do (evil-set-initial-state mode state))
+;(require 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)
-;(global-evil-tabs-mode t)
-;(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" ".*" ))))
-(global-set-key (kbd "C-x f") 'fiplr-find-file)
+(require 'init-multi-term)
+;(require 'init-projectile)
-;;---------------------------------------------------------------------------------------
-;; 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)
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
-;;---------------------------------------------------------------------------------------
-;; sr-speedbar
-;;
-;(require 'sr-speedbar)
-;(setq speedbar-use-images nil)
-;(setq speedbar-show-unknown-files t)
+;(setq projectile-completion-system 'helm)
+;(helm-projectile-on)
-(toggle-frame-fullscreen)
+;; show projectile name in mode-line
-(require 'projectile)
-(projectile-global-mode)
-(setq projectile-enable-caching t)
-(require 'projectile-speedbar)
+(if (locate-library "ediff")
+ (progn
+ (autoload 'ediff-files "ediff")
+ (autoload 'ediff-buffers "ediff")
-(require 'cc-mode)
-(require 'ecb)
+ (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)
-(setq ecb-layout-name "leftright3")
+ (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)))))
-;(setq mac-command-modifier 'super) ; make cmd key do Meta
-(global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
+(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))
-(global-set-key (kbd "M-g M-v") 'split-window-right)
-(global-set-key (kbd "M-g M-s") 'split-window-below)
-(global-set-key (kbd "M-g M-o") 'delete-other-windows)
+;(require 'helm-ag)
+;(require 'flx)
+;(flx-ido-mode t)
-(global-set-key (kbd "M-g M-w") 'other-window)
-;;;; show default directory on mode-line
+(fringe-mode (quote (0 . 0)))
projects / dotfiles.git / blobdiff