X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=813f41a2555716f258a53f4a48580415940913b0;hb=be4017091a741b544d0a7761429fdd9f6635b128;hp=05ed8040285b23855a3fb5cf15341bf29bd43583;hpb=81001e7e9c7af808ad6a54aebf947d4026c68055;p=dotfiles.git diff --git a/emacs.d/init.el b/emacs.d/init.el index 05ed804..813f41a 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -1,189 +1,8 @@ -(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") - -;; 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-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) - - - - - -;;;(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 'init-keychord) - -;(setq hydra-examples-verbatim t) -(require 'init-hydra) - - -;(require 'ace-window) -;(global-set-key (kbd "M-p") 'ace-window) - - -(require 'init-multi-term) -(require 'init-projectile) - -(require 'page-break-lines) -;(turn-on-page-break-lines-mode) -(global-page-break-lines-mode 1) - -;(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) - - +;; 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) +(org-babel-load-file "~/.emacs.d/config.org")