emacs: add evil powerline mode

[dotfiles.git] / emacs.d / config / init-color-theme.el

diff --git a/emacs.d/config/init-color-theme.el b/emacs.d/config/init-color-theme.el
index 4301931..6250837 100644 (file)
--- a/emacs.d/config/init-color-theme.el
+++ b/emacs.d/config/init-color-theme.el
@@ -7,53 +7,14 @@
 (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)
-
-;(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)
-;;
+(require 'powerline-evil)
 
 
-;; 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
@@ -131,6 +92,11 @@
                                   "+1" "+2" "FlyC" "Fly" ;; ":1/0"
                                   "Fill" "AC" "FIC") "\\|")) "" s))
 
+(defun powerline-format-default-directory (s)
+  (if s
+    (replace-regexp-in-string "/Users/peli3/"  "~/" s)
+    s))
+
 (defun powerline-ha-theme ()
   "A powerline theme that removes many minor-modes that don't serve much purpose on the mode-line."
   (interactive)
@@ -160,20 +126,37 @@
                                   (cdr powerline-default-separator-dir))))
                         (lhs
                             (list
-                                (powerline-raw "%*" nil 'l)
-                                (powerline-buffer-id nil 'l)
-                                (powerline-raw " ")
-                                (funcall separator-left mode-line face-blue )
+                                (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)
+                                (funcall separator-left face-yel face-blue )
+                                               (powerline-raw " " face-blue)
                                 (powerline-major-mode face-blue 'r)
-                                (funcall separator-left face-blue face1)
-                                (powerline-narrow face1 'l)
-                                (powerline-simpler-vc-mode (powerline-vc face1))))
+                                (funcall separator-left face-blue mode-line)
+                                (powerline-narrow mode-line 'l)
+;                                (powerline-vc mode-line 'r)
+                                (powerline-simpler-vc-mode (powerline-vc mode-line 'r))
+                                (funcall separator-left mode-line face1)))
+;                                (powerline-simpler-vc-mode (powerline-vc face2))))
                        
                         (rhs
                             (list
                                 (funcall separator-right face1 mode-line)
-                                (powerline-raw (concat "%3c, %l/" (format "%d" (count-lines (point-min) (point-max))) " %4p") mode-line)
-                                (funcall separator-right mode-line face1)
+                                (powerline-raw (concat "%3c, %l/" (format "%d" (count-lines (point-min) (point-max))) " %4p ") mode-line)
+                                               (funcall separator-right mode-line face-blue)
+                                               (powerline-raw " [" face-blue)
+                                               (powerline-raw (powerline-format-default-directory default-directory) face-blue )
+                                               (powerline-raw "] " face-blue)
+                                               (funcall separator-right face-blue face1)
                                            (powerline-raw (format-time-string " %m-%d") face1 'r)
                                 (funcall separator-right face1 face-yel)
                                            (powerline-raw (format-time-string " %I:%M %p %a ") face-yel 'r)))
@@ -208,7 +191,9 @@
 
 (powerline-ha-theme)
 
+(provide 'init-color-theme)
 
 
-
-(provide 'init-color-theme)
+;; TODO
+;; 1. change color when buffer is modified
+;; 2.