From: Peng Li <seudut@gmail.com>
Date: Sat, 13 Jun 2015 15:26:26 +0000 (+0800)
Subject: emacs: add evil powerline mode
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;ds=sidebyside;h=8ec0fef1eb0c7622cc7f2087b88feb0dbc5fbedd;p=dotfiles.git

emacs: add evil powerline mode
---

diff --git a/emacs.d/config/init-color-theme.el b/emacs.d/config/init-color-theme.el
index e28f044..6250837 100644
--- a/emacs.d/config/init-color-theme.el
+++ b/emacs.d/config/init-color-theme.el
@@ -7,54 +7,15 @@
 (setq ns-use-srgb-colorspace nil)
 
 (require 'color-theme)
-;(load-theme 'tango-dark)
-;(require 'moe-theme)
-;(moe-dark)
 
-
-;(add-to-list 'custom-theme-load-path "~/.emacs.d/el-get/color-theme-tangotango")
-;(load-theme 'tangotango t)
 (load-theme 'cyberpunk t)
 
-;(require 'color-theme-sanityinc-tomorrow)
-;(color-theme-sanityinc-tomorrow-bright)
-
-
-
-;(add-to-list 'load-path "~/.emacs.d/vendor/emacs-powerline")
+(require 'evil)
 (require 'powerline)
-;(powerline-default-theme)
-;(require 'powerline-evil)
-
-;(defconst color1 "#6b8e23")
-;(defconst color2 "#eedd82")
-
-;(make-face 'mode-line-color-1)
-;(set-face-attribute 'mode-line-color-1 nil
-;                    :foreground "#fffacd"
-;                    :bold t
-;                    :background color1)
+(require 'powerline-evil)
 
-;(make-face 'mode-line-color-2)
-;(set-face-attribute 'mode-line-color-2 nil
-;                    :foreground "#fffacd"
-;                    :bold t
-;                    :background color2)
 
 
-;;(defface powerline-active2 '((t (:background "grey40" :inherit mode-line)))
-;;  "Powerline face 2."
-;;  :group 'powerline)
-;;
-
-
-;; https://github.com/howardabrams/dot-files/blob/master/emacs-mode-line.org
-;;;(custom-set-faces
-;;; '(mode-line-buffer-id ((t (:foreground "#008000" :bold t))))
-;;; '(which-func ((t (:foreground "#008000"))))
-;;; '(mode-line ((t (:foreground "#008000" :background "#dddddd" :box nil))))
-;;; '(mode-line-inactive ((t (:foreground "#008000" :background "#bbbbbb" :box nil)))))
-
 ;;; this variable should equal as height in mode-line
 (custom-set-variables
  '(powerline-text-scale-factor 0.85))
@@ -165,6 +126,15 @@
                                   (cdr powerline-default-separator-dir))))
                         (lhs
                             (list
+                                (let ((evil-face (powerline-evil-face)))
+                                    (if evil-mode
+;                                        (progn 
+                                            (powerline-raw (powerline-evil-tag) evil-face)
+;;                                            )
+                                        )
+                                    )
+                                (funcall separator-left (powerline-evil-face) face-yel)
+
                                 (powerline-raw "%*" face-yel 'l)
                                 (powerline-buffer-id face-yel 'l)
                                 (powerline-raw " " face-yel)
diff --git a/emacs.d/config/my-packages.el b/emacs.d/config/my-packages.el
index ddb2759..212ddf6 100644
--- a/emacs.d/config/my-packages.el
+++ b/emacs.d/config/my-packages.el
@@ -19,7 +19,7 @@
     color-theme
     color-theme-sanityinc-tomorrow
     key-chord
-;    powerline-evil
+    powerline-evil
     powerline
     evil-leader
     flx-ido
diff --git a/emacs.d/init.el b/emacs.d/init.el
index bd7b601..f90e303 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -23,6 +23,7 @@
 (setq visible-bell 1)
 (setq ring-bell-function 'ignore)
 (setq resize-mini-windows t)
+(blink-cursor-mode 0)
 
 
 (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
@@ -42,8 +43,8 @@
 (require 'my-packages)
 
 ;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
-(elscreen-start)
-(require 'init-elscreen)
+;(elscreen-start)
+;(require 'init-elscreen)
 (require 'init-color-theme)
 
 
@@ -78,7 +79,7 @@
 ;(setq magit-auto-revert-mode nil)
 
 
-;(require 'init-evil)
+(require 'init-evil)
 
 
 
@@ -148,16 +149,27 @@
 ;(require 'eyebrowse)
 ;(eyebrowse-mode t)
 
-;(require 'workgroups2)
-;(workgroups-mode 1)
+(require 'workgroups2)
+(workgroups-mode 1)
 
 
 (require 'minibuffer-line)
-(minibuffer-line-mode 1)
+;(minibuffer-line-mode 1)
 
 
 ;(add-to-list 'load-path "~/.emacs.d/vendor")
 ;(require 'minibuffer-tray)
 ;(minibuffer-tray-mode 1)
+;(require 'xwem-minibuffer)
+
+; (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 ")))))
+