X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=9a62fa5f28fbed86518005e9af838572b03d1126;hb=8300675f36f1b4caad5288c05d47ad4fdb5bd44b;hp=5441c95556d29180fbbb504604b66a842fd0629d;hpb=52a86d626b76dabe227498f402d1c20692dd8ae8;p=dotfiles.git diff --git a/emacs.d/init.el b/emacs.d/init.el index 5441c95..9a62fa5 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -1,346 +1,347 @@ -;;;(if (eq system-type 'darwin) -;;; (setenv "PATH" -;;;) (concat (getenv "path") ":/usr/local/bin:~/bin/") -;;; ) +;; 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"))) -(setq debug-on-error t) +;; package manager +(require 'package) -(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" )) -(setq inhibit-startup-message t) +(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) -(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) -(blink-cursor-mode 0) +(package-initialize) +;; use-package +(unless (package-installed-p 'use-package) + (package-refresh-contents) + (package-install 'use-package)) -(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode)) +(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) -;;; 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") -(require 'my-packages) -;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6 -;(elscreen-start) -;(require 'init-elscreen) -;(require 'elscreen) -;(custom-set-faces -; '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black")))) -; '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black"))))) -(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) +(use-package ido-vertical-mode + :ensure t) -(setq org-completion-use-ido t) -(setq magit-completing-read-function 'magit-ido-completing-read) -(require 'ido-ubiquitous) -(ido-ubiquitous-mode 1) +(use-package hydra + :ensure t + :config + (hydra-add-font-lock)) -;; 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) +;;;;;;;;; +(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) + ) -(require 'init-evil) +(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)) + ) -;;--------------------------------------------------------------------------------------- -;; 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" ".*" )))) +(use-package multi-term + :ensure t + ) -(global-set-key (kbd "C-x f") 'fiplr-find-file) -;;--------------------------------------------------------------------------------------- -;; sr-speedbar -;; -;(require 'sr-speedbar) -;(setq speedbar-use-images nil) -;(setq speedbar-show-unknown-files 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)) -(require 'projectile) -(projectile-global-mode) -(setq projectile-enable-caching t) -(require 'projectile-speedbar) -;(require 'cc-mode) -;(require 'ecb) +(use-package org-bullets + :ensure t + :init + (add-hook 'org-mode-hook + (lambda () + (org-bullets-mode t)))) + +(org-bullets-mode t) -;(setq ecb-layout-name "leftright3") +(setq org-hide-leading-stars t) -;; gnu global support -;(require 'semantic/db) -;(global-semanticdb-minor-mode 1) +(setq org-src-fontify-natively t) -(require 'init-ggtags) +(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 scroll-margin 5) -(setq scroll-conservatively 10000) -(show-paren-mode t) -(require 'init-c-cpp) +;(setq lispy-mode-hooks +; '(clojure-mode-hook +; emacs-lisp-mode-hook +; lisp-mode-hook +; scheme-mode-hook)) -(require 'recentf) -(recentf-mode 1) -(setq recentf-max-menu-items 100) +;(dolist (hook lispy-mode-hooks) +; (add-hook hook (lambda () +; (setq show-paren-style 'expression) +; (paredit-mode) +; (rainbow-delimiters-mode)))) -(require 'recentf-ext) -(require 'init-key-binding) +;(add-to-list 'load-path "~/.emacs.d/config") -(winner-mode 1) +;; 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) -(global-set-key (kbd "C-c C-l") 'winner-redo) -(global-set-key (kbd "C-c C-h") 'winner-undo) +;(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) -;(require 'minibuffer-tray) -;(require 'eyebrowse) -;(eyebrowse-mode t) +;;;; 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 'minibuffer-line) -;(minibuffer-line-mode 1) +;(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") ; -;(add-to-list 'load-path "~/.emacs.d/vendor") -;(require 'minibuffer-tray) -;(minibuffer-tray-mode 1) -;(require 'xwem-minibuffer) +;(require 'init-linum) -; (run-at-time -; nil 30 -; (lambda () -; (with-current-buffer " *Minibuf-0*" -; (erase-buffer) -; (dotimes (spaces (- (frame-width) 20)) -; (insert " ")) -; (insert (format-time-string "%m-%d %I:%M %p %a "))))) +;(require 'auto-complete) +;(require 'auto-complete-config) +;(ac-config-default) -;;; set font size of minibuffer -;;;; http://stackoverflow.com/questions/7869429/altering-the-font-size-for-the-emacs-minibuffer-separately-from-default-emacs -(add-hook 'minibuffer-setup-hook 'my-minibuffer-setup) -(defun my-minibuffer-setup () - (set (make-local-variable 'face-remapping-alist) - '((default :height 120)))) +;; 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) -(add-hook 'minibuffer-setup-hook - (lambda () - (make-local-variable 'face-remapping-alist) - (add-to-list 'face-remapping-alist '(default (:background "green"))))) +;(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 'evil-escape) -;(setq-default evil-escape-delay 0.2) -;(setq evil-escape-excluded-major-modes '(dired-mode)) -;(setq-default evil-escape-key-sequence "jj") -;(evil-escape-mode 1) -;; --------------- -;; recent file -(require 'recentf) -(recentf-mode) -;(setq recentf-max-menu-items 100) -;; http://www.emacswiki.org/emacs/RecentFiles -(defun recentf-ido-find-file () - "Find a recent file using Ido." - (interactive) - (let ((file (ido-completing-read "Choose recent file: " recentf-list nil t))) - (when file - (find-file file)))) +;;;(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))) -;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance -(ac-linum-workaround) +;(require 'icicles) +;(icy-mode 1) -;; --------------------------------- -;; linum-relative +;;(require 'init-org) +;(setq help-window-select t) -(require 'linum-relative) -(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. - '(fringe-mode (quote (4 . 0)) nil (fringe)) - '(ggtags-split-window-function (quote split-window-vertically)) - '(hes-mode-alist - (quote - ((c-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") - (cperl-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") - (c++-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") - (objc-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)") - (java-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|u[[:xdigit:]]\\{4\\}\\|[\"'\\bfnrt]\\)\\)") - (js-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)") - (js2-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)") - (ruby-mode - ("\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{1,2\\}\\|u\\(?:[[:xdigit:]]\\{4\\}\\|{[[:xdigit:]]\\{1,6\\}\\(?:[[:space:]]+[[:xdigit:]]\\{1,6\\}\\)*}\\)\\|.\\)\\)" - (0 - (let* - ((state - (syntax-ppss)) - (term - (nth 3 state))) - (when - (or - (and - (eq term 39) - (member - (match-string 2) - (quote - ("\\" "'")))) - (if - (fboundp - (quote ruby-syntax-expansion-allowed-p)) - (ruby-syntax-expansion-allowed-p state) - (memq term - (quote - (34 47 10 96 t))))) - (add-face-text-property - (match-beginning 1) - (match-end 1) - (quote hes-escape-backslash-face)) - (add-face-text-property - (match-beginning 2) - (match-end 2) - (quote hes-escape-sequence-face)) - nil)) - prepend)))))) - '(org-agenda-files (quote ("~/temp/org-note.org"))) - '(powerline-text-scale-factor 0.85)) - -;; maybe better to fix the size of line number rather scaled 0.8 -;; https://github.com/howardabrams/dot-files/blob/master/emacs.org -(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. - '(highlight-current-line-face ((t (:background "gray22")))) - '(linum ((t (:background "#000000" :foreground "gray40" :height 0.8 :slant italic :weigth light)))) - '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8)))) - '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :family "Source Code Pro for Powerline" :height 100)))) - '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil :family "Source Code Pro for Powerline" :height 100))))) +;(require 'init-keychord) -;; enable linum-relative in programming mode -;https://github.com/howardabrams/dot-files/blob/master/emacs.org -(add-hook 'prog-mode-hook 'linum-mode) +;(setq hydra-examples-verbatim t) +;(require 'init-hydra) -;; hight current line -(require 'highlight-current-line) -(highlight-current-line-on t) +;(require 'ace-window) +;(global-set-key (kbd "M-p") 'ace-window) +;(require 'init-multi-term) +;(require 'init-projectile) -;(defun pl-fringe-mode () -; "jfoewoif" -; (if linum-mode -; (fringe-mode '(4 . 0)) -; (fringe-mode '(0 . 0)))) +;(require 'page-break-lines) +;(turn-on-page-break-lines-mode) +;(global-page-break-lines-mode 1) +;(setq projectile-completion-system 'helm) +;(helm-projectile-on) -;(add-hook 'eshell-mode-hook 'pl-fringe-mode) -;(add-hook 'prog-mode-hook 'pl-fringe-mode) +;; 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))))) -(require 'workgroups2) +;(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)) -(setq wg-prefix-key (kbd "C-c z")) -(setq wg-session-file "~/.emacs.d/.emacs_workgroups") -(setq wg-mode-line-display-on t) ; Default: (not (featurep 'powerline)) -(setq wg-flag-modified t) ; Display modified flags as well -(setq wg-mode-line-decor-left-brace "[" - wg-mode-line-decor-right-brace "]" ; how to surround it - wg-mode-line-decor-divider ":") -;(workgroups-mode 1) -(defalias 'perl-mode 'cperl-mode) -;(setq cperl-invalid-face nil) - (setq cperl-invalid-face (quote off)) -;(add-hook 'prog-mode-hook '(lambda () -; (highlight-regexp "%[[:alpha:]]\\|\\\\[[:alpha:]]"))) -(require 'highlight-escape-sequences) -(hes-mode) -;(setq cperl-font-lock t) -(put 'hes-escape-backslash-face 'face-alias 'font-lock-builtin-face) -(put 'hes-escape-sequence-face 'face-alias 'font-lock-builtin-face) +;(require 'helm-ag) +;(require 'flx) +;(flx-ido-mode t) -(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/") -(load "pde-load") -(require 'init-linum) +;(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. + )