X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=2afcacab32d64c4502131930dd8c90cc10882cad;hb=0118b4f852d46086bd4c001425538dbb0644a106;hp=aabaed6a7d196c5013c27e482caa859d75ef1943;hpb=56e8d165c4c9e28752c82218aff6af65665007aa;p=dotfiles.git diff --git a/emacs.d/init.el b/emacs.d/init.el index aabaed6..2afcaca 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -1,244 +1,190 @@ -;;;(if (eq system-type 'darwin) -;;; (setenv "PATH" -;;;) (concat (getenv "path") ":/usr/local/bin:~/bin/") -;;; ) - (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" )) +(add-to-list 'load-path "~/.emacs.d/config") -(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) +;; 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) -(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode)) -(fringe-mode 0) +(require 'my-packages) +(require 'init-color-theme) +;(require 'init-ido) +(require 'init-magit) +(require 'init-evil) +(require 'init-project) +(require 'init-ggtags) -;;; Set symbol for the border -(set-display-table-slot standard-display-table - 'vertical-border - (make-glyph-code ?┃)) +;;;; 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) -(set-face-attribute 'vertical-border nil :foreground "gray") +;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance +;;;(ac-linum-workaround) -(add-to-list 'load-path "~/.emacs.d/config") -(require 'my-packages) +(require 'init-mode-line) +;(require 'init-workgroup2) +(require 'init-perl) -;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6 -(elscreen-start) -(require 'init-elscreen) -(require 'init-color-theme) +;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/") +;(load "pde-load") ; +(require 'init-linum) -;--------------------------------------------------------------------------------------- -;; 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 'auto-complete) +(require 'auto-complete-config) +(ac-config-default) -;(require 'init-evil) +(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) -;;--------------------------------------------------------------------------------------- -;; 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 'use-package) -;;--------------------------------------------------------------------------------------- -;; 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) +;; 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))) -;;--------------------------------------------------------------------------------------- -;; sr-speedbar -;; -;(require 'sr-speedbar) -;(setq speedbar-use-images nil) -;(setq speedbar-show-unknown-files t) +;;(savehist-mode) +;; (setq history-length 1000 +;; history-delete-duplicates t +;; savehist-additional-variables '(extended-command-history)) +; (setq split-height-threshold 0) -;(toggle-frame-fullscreen) -(require 'projectile) -(projectile-global-mode) -(setq projectile-enable-caching t) -(require 'projectile-speedbar) -;(require 'cc-mode) -;(require 'ecb) -;(setq ecb-layout-name "leftright3") +;;;(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 mac-command-modifier 'super) ; make cmd key do Meta -(global-set-key (kbd "") 'toggle-frame-fullscreen) +;(require 'icicles) +;(icy-mode 1) +;(require 'init-org) +(setq help-window-select t) -(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) +;; (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) -(global-set-key (kbd "M-g M-w") 'other-window) +;(setq hydra-examples-verbatim t) +(require 'init-hydra) -;; gnu global support -;(require 'semantic/db) -;(global-semanticdb-minor-mode 1) -(require 'init-ggtags) +;(require 'ace-window) +;(global-set-key (kbd "M-p") 'ace-window) -(global-unset-key "\C-o") -(global-set-key (kbd "C-o C-f") 'ido-find-file) -(global-set-key (kbd "C-o C-b") 'ido-switch-buffer) -(global-set-key (kbd "C-o g") 'ggtags-find-file) -(global-set-key (kbd "C-o t") 'ggtags-find-tag-dwim) +(require 'init-multi-term) +(require 'init-projectile) -(global-set-key (kbd "M-g M-g") 'magit-status) +(require 'page-break-lines) +;(turn-on-page-break-lines-mode) +(global-page-break-lines-mode 1) +;(setq projectile-completion-system 'helm) +;(helm-projectile-on) -(setq scroll-margin 5) -(setq scroll-conservatively 10000) -(show-paren-mode t) -;;; next, cedet & ecb for c++ development -;(require 'cc-mode) -;(require 'semantic) +;; show projectile name in mode-line -;(global-semanticdb-minor-mode 1) -;(global-semantic-idle-scheduler-mode 1) -;(semantic-mode 1) +(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))))) -; set LD_LIBRARY_PATH -(setenv "LD_LIBRARY_PATH" "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/") -; load irony-mode -;( add-to-list 'load-path (expand-file-name "~/.emacs.d/irony-mode/elisp/")) -(require 'irony) -(add-hook 'c++-mode-hook 'irony-mode) -(add-hook 'c-mode-hook 'irony-mode) -(add-hook 'objc-mode-hook 'irony-mode) -;; replace the `completion-at-point' and `complete-symbol' bindings in -;; irony-mode's buffers by irony-mode's function -(defun my-irony-mode-hook () - (define-key irony-mode-map [remap completion-at-point] - 'irony-completion-at-point-async) - (define-key irony-mode-map [remap complete-symbol] - 'irony-completion-at-point-async)) -(add-hook 'irony-mode-hook 'my-irony-mode-hook) -(add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options) +(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)) -;; c/c++ auto-complete, yasnippet, auto-complet-c-headers -;;https://www.youtube.com/watch?v=HTUE03LnaXA&list=PL-mFLc7R_MJet8ItKipCtYc7PWoS5KTfM -(require 'auto-complete) -(require 'auto-complete-config) -(ac-config-default) -;; input TAB to -(require 'yasnippet) -(yas-global-mode 1) - -;; auto-complete-c-headers -(defun my:ac-c-header-init () - (require 'auto-complete-c-headers) - (add-to-list 'ac-sources 'ac-source-c-headers) - (add-to-list 'achead:include-directories "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include") -) -;; call this function from c/c++ hooks -(add-hook 'c++-mode-hook 'my:ac-c-header-init) -(add-hook 'c-mode-hook 'my:ac-c-header-init) - -;;; iedit, fix iedit bug in Mac, C-c ; to trigger multiple cursor edit -(define-key global-map (kbd "C-c ;") 'iedit-mode) - -;; flymake-google-cpplint-load -;; define a function for flymake initialization -;(defun my:flymake-google-init () -; (require 'flymake-google-cpplint) -; (custom-set-variables -; '(flymake-google-cpplint-command "/usr/local/bin/cpplint")) -; (flymake-google-cpplint-load) -; ) -;(add-hook 'c-mode-hook 'my:flymake-google-init) -;(add-hook 'c++-mode-hook 'my:flymake-google-init) - -;; start google-c-style with emacs -;(require 'google-c-style) -;(add-hook 'c-mode-hook 'google-set-c-style) -;(add-hook 'c++-mode-hook 'google-make-newline-indent) - - - -;; cedet -(semantic-mode 1) -;; let's define a function which adds semantic as a suggestion backend to auto complete -(defun my:add-semantic-to-autocomplete() - (add-to-list 'ac-sources 'ac-source-semantic) - ) -(add-hook 'c-mode-common-hook 'my:add-semantic-to-autocomplete) -;; turn on ede mode -(global-ede-mode 1) - -;(ede-cpp-root-project "my project" :file "~/demos/my_program/src/main.cpp" -; :include-path '("/../my_inc")) -;; you can use system-include-path for setting up the system header file locations. - -;; turn on automatic reparsing of open buffers in semantic -(global-semantic-idle-scheduler-mode 1) -(global-semantic-stickyfunc-mode 1) + +(require 'helm-ag) +(require 'flx) +(flx-ido-mode t) + + + +(require 'dired+)