X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=9a62fa5f28fbed86518005e9af838572b03d1126;hb=8300675f36f1b4caad5288c05d47ad4fdb5bd44b;hp=7976c0cc407c931010d449c00cbde302ee73ea62;hpb=09a27f206951958452a9232ca26a169823c4af1d;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7976c0c..9a62fa5 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,265 +1,347 @@
-(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)
-
-
-(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))
-;(set-fringe-mode nil)
-(fringe-mode 0)
-;(set-fringe-mode 1)
-
-;(set-face-inverse-video-p 'vertical-border nil)
-;(set-face-background 'vertical-border (face-background 'default))
-;
-;;; Set symbol for the border
-;(set-display-table-slot standard-display-table
-;                        'vertical-border 
-;                        (make-glyph-code ?┃))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;http://y.tsutsumi.io/emacs-from-scratch-part-2-package-management.html
+
+;; 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)
+
+ (load-library "url-handlers")
+
+(setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
+(setq exec-path (append exec-path '("/usr/local/bin")))
+
+;; package manager
 (require 'package)
+
 (add-to-list 'package-archives
              '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(add-to-list 'package-archives
+             '("org" . "http://orgmode.org/elpa/") t)
+;(add-to-list 'package-archives
+;             '("marmalade" . "http://marmalade-repo.org/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
-  ) "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...")
+;; use-package
+(unless (package-installed-p 'use-package)
   (package-refresh-contents)
-  (message "%s" " done.")
-  (dolist (p required-packages)
-    (when (not (package-installed-p p))
-      (package-install p))))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-					;
-;;(elscreen-start)
-
-;;---------------------------------------------------------------------------------------
-;; color theme
-;;
-(require 'color-theme)
-(load-theme 'sanityinc-tomorrow-bright t)
-
-;;---------------------------------------------------------------------------------------
-;; 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 ido-enable-flex-matching t)
-;(setq ido-use-faces t)
-;(setq ido-use-faces nil)
-;(set-face-attribute 'ido-vertical-first-match-face nil
-;		    :background "#e5b7c0")
-;(set-face-attribute 'ido-vertical-only-match-face nil
-;		    :background "#e52b50"
-;		    :foreground "white")
-;(set-face-attribute 'ido-vertical-match-face nil
-;		    :foreground "#b00000")
-
-(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-auto-revert-mode nil)
-(setq magit-last-seen-setup-instructions "1.4.0")
-
-;;---------------------------------------------------------------------------------------
-;; powerline
-;;
-;(require 'powerline)
-;(powerline-evil-vim-color-theme)
-;(powerline-evil-center-color-theme)
-(display-time-mode t)
-
-;;---------------------------------------------------------------------------------------
-;; 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-normal-state-map "jj" 'evil-force-normal-state)
-;(key-chord-define evil-visual-state-map "jj" 'evil-change-to-previous-state)
-(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
-;(key-chord-define evil-replace-state-map "jj" 'evil-normal-state)
-(key-chord-mode 1)
-
-;; change mode-line color by evil state
-;(lexical-let ((default-color (cons (face-background 'mode-line)
-;				   (face-foreground 'mode-line))))
-;  (add-hook 'post-command-hook
-;	    (lambda ()
-;	      (let ((color (cond ((minibufferp) default-color)
-;				 ((evil-insert-state-p) '("#e80000" . "#ffffff"))
-;				 ((evil-emacs-state-p)  '("#444488" . "#ffffff"))
-;				 ((buffer-modified-p)   '("#006fa0" . "#ffffff"))
-;				 (t default-color))))
-;		(set-face-background 'mode-line (car color))
-;		           (set-face-foreground 'mode-line (cdr color))))))
-;; 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)
-;(require 'powerline-evil)
-;; TODO: enter emacs mode in eshll rather then evil mode
-
-;;---------------------------------------------------------------------------------------
-;; 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)
-;;---------------------------------------------------------------------------------------
-
-;(setq mac-right-option-modifier 'control)
-
-
-
-;;---------------------------------------------------------------------------------------
-;; Helm
-;;
-;;;;;;;;;;; helm configuration https://github.com/emacs-helm/helm http://tuhdo.github.io/helm-intro.html
-;;(require 'helm-config)
-;;(global-set-key (kbd "M-x") 'helm-M-x)
-;;(helm-mode 1)
-;;(setq helm-M-x-fuzzy-match t)
-;;(global-set-key (kbd "C-x b") 'helm-mini)
-;;(setq helm-buffers-fuzzy-matching t
-;;      helm-recentf-fuzzy-match    t)
-;;(global-set-key (kbd "C-x C-f") 'helm-find-files)
-;;(when (executable-find "ack-grep")
-;;  (setq helm-grep-default-command "ack-grep -Hn --no-group --no-color %e %p %f"
-;;        helm-grep-default-recurse-command "ack-grep -H --no-group --no-color %e %p %f"))
-;;(setq helm-ff-skip-boring-files t)
-;;;(require 'helm-config)
-;;;(require 'helm-themes)
-;;;(set-face-attribute 'helm-selection nil :background "#441100")
-
-;;---------------------------------------------------------------------------------------
-;; auto-complete
-;;
-(require 'auto-complete)
-(auto-complete-mode 1)
-
-
-;;; ---------------------------------------- el-get -----------------------------------------
-;(require 'el-get)
-;(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-user/recipes")
-
-;(el-get-bundle packages/sm-package-powerline
-;  :url "https://github.com/laynor/emacs-conf.git"
-;  )
-
-
-
-;; 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)
-
-;(global-set-key (kbd "C-x C-s") 'split-window-right)
-
-;; windows devider
-(set-face-attribute 'vertical-border 
-                    nil 
-                    :foreground "gray")
-
-
-
-
-
-(add-to-list 'load-path "~/.emacs.d/config")
-(require 'init-color-theme)
+  (package-install 'use-package))
+
+(require 'use-package)
+
+;;;;; load path
+(add-to-list 'load-path "~/.emacs.d/elisp")
+
+;;; load elisp config
+(require 'init-base)
+(require 'init-magit)
+(require 'init-helm)
+(require 'init-projectile)
+(require 'init-org)
+
+
+
+
+
+
+
+
+
+(use-package ido-vertical-mode
+  :ensure t)
+
+
+(use-package hydra
+  :ensure t
+  :config
+  (hydra-add-font-lock))
+
+
+;;;;;;;;;
+(use-package ace-jump-mode
+  :commands ace-jump-mode
+  :init
+  (bind-key "C-." 'ace-jump-mode))
+
+(use-package sublime-themes
+  :ensure t
+  :config
+  (load-theme 'spolsky t)
+  )
+
+(use-package avy
+  :ensure t
+  )
+
+(use-package use-package-chords
+  :ensure t
+  :config
+  (key-chord-mode 1)
+  (setq key-chord-two-keys-delay 0.5))
+
+(use-package evil
+  :ensure t
+  :config
+  (evil-mode t)
+  (defalias 'evil-insert-state 'evil-emacs-state)
+  (key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
+  (key-chord-define evil-emacs-state-map "jj" 'evil-normal-state)
+;  (setq evil-emacs-state-cursor '("red" box))
+  (setq evil-emacs-state-cursor '("green" bar))
+  (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))
+  )
+
+(use-package multi-term
+  :ensure t
+  )
+
+
+
+;(use-package smex
+;  :ensure t
+;  :init (smex-initialize)
+;  :bind ("M-x" . smex)
+;        ("M-X" . smex-major-mode-commands))
+
+
+(add-to-list 'load-path "~/.emacs.d/pde")
+(load "pde-load")
+
+(add-to-list 'default-frame-alist '(fullscreen . maximized))
+
+
+(use-package org-bullets
+  :ensure t
+  :init
+  (add-hook 'org-mode-hook
+            (lambda ()
+              (org-bullets-mode t))))
+  
+(org-bullets-mode t)
+
+(setq org-hide-leading-stars t)
+
+(setq org-src-fontify-natively t)
+
+(font-lock-add-keywords 'org-mode
+                    '(("\\(src_\\)\\([^[{]+\\)\\(\\[:.*\\]\\){\\([^}]*\\)}"
+                       (1 '(:foreground "black" :weight 'normal :height 10)) ; src_ part
+                       (2 '(:foreground "cyan" :weight 'bold :height 75 :underline "red")) ; "lang" part.
+                       (3 '(:foreground "#555555" :height 70)) ; [:header arguments] part.
+                       (4 'org-code) ; "code..." part.
+                       )))
+
+
+
+
+;(setq lispy-mode-hooks
+;      '(clojure-mode-hook
+;        emacs-lisp-mode-hook
+;        lisp-mode-hook
+;        scheme-mode-hook))
+
+;(dolist (hook lispy-mode-hooks)
+;  (add-hook hook (lambda ()
+;                   (setq show-paren-style 'expression)
+;                   (paredit-mode)
+;                   (rainbow-delimiters-mode))))
+
+
+
+;(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-helm)
+
+;(require 'init-color-theme)
+;(require 'init-color-theme-2)
+;(require 'init-ido)
+;(require 'init-magit)
+;(require 'init-evil)
+;(require 'init-project)
+;(require 'init-ggtags)
+
+;(require 'init-projectile)
+
+;;;; 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)
+
+
+
+
+;; 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)
+
+
+
+;(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-setu;p-windows-plain)
+;
+;			  (add-hook 'ediff-startup-hook 'ediff-toggle-w;ide-display)
+;			  (add-hook 'ediff-cleanup-hook 'ediff-toggle-w;ide-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)
+
+
+
+;(fringe-mode (quote (0 . 0)))
+
+
+(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.
+ '(package-selected-packages
+   (quote
+    (helm yasnippet workgroups2 w3m use-package tangotango-theme tabbar smex session rich-minority relative-line-numbers recentf-ext projectile-speedbar pp-c-l powerline persp-projectile paradox page-break-lines org-cliplink org-caldav org-bullets multi-term monokai-theme molokai-theme moe-theme minibuffer-line markdown-mode magit linum-relative key-chord jekyll-modes irony iedit ido-vertical-mode ido-ubiquitous icicles hydra highlight-tail highlight-escape-sequences highlight-current-line helm-projectile helm-ls-svn helm-ls-git helm-gtags helm-ag google-c-style ggtags flyspell-lazy flymake-google-cpplint flymake-cursor flx-ido fiplr eyebrowse evil-leader evil-escape ecb dired+ diff-hl cyberpunk-theme company color-theme-sanityinc-tomorrow color-theme color-identifiers-mode auto-complete-c-headers ace-window ace-jump-mode))))
+(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.
+ )