X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-color-theme.el;h=883e802677fa28d59d9ed471a4bbc9c9d3b1b6eb;hb=8300675f36f1b4caad5288c05d47ad4fdb5bd44b;hp=cb50ec0b3f2c05485d41baf552c070ec1ba31c38;hpb=b737119d209de265d5a48d77320db060ec56ebcf;p=dotfiles.git

diff --git a/emacs.d/config/init-color-theme.el b/emacs.d/config/init-color-theme.el
index cb50ec0..883e802 100644
--- a/emacs.d/config/init-color-theme.el
+++ b/emacs.d/config/init-color-theme.el
@@ -20,7 +20,8 @@
 
 ;;; this variable should equal as height in mode-line
 (custom-set-variables
- '(powerline-text-scale-factor 0.74)) ;; 100/140
+ '(powerline-height 14)
+ '(powerline-text-scale-factor 0.85)) ;; 100/140
 
 (custom-set-faces
 ;;; '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :height 0.8 ))))
@@ -178,6 +179,21 @@
   (concat (replace-regexp-in-string "[<>]" "" (powerline-evil-tag)) " ")
   )
 
+;; -----------------------------------------------------------------------------
+
+;; -----------------------------------------------------------------------------
+;; |evil| buffer_name | major-mode | vc |            | position | pwd | time |
+;; -----------------------------------------------------------------------------
+;;
+;; ToDo:
+;; position and pwd only shows in some mode, such as programming mode
+;; using workgroup instead of pwd
+;; some other modes such as eshell, package, help, don't need the posittion and
+;; pwd
+;;
+
+;; -----------------------------------------------------------------------------
+
 (defun powerline-ha-theme ()
   "A powerline theme that removes many minor-modes that don't serve much purpose on the mode-line."
   (interactive)
@@ -219,7 +235,8 @@
 ;;                                    )
 ;;
 ;;                                )
-                                (powerline-raw (powerline-evil-tag) pl-evil-face)
+                                (if evil-mode
+                                (powerline-raw (powerline-evil-tag) pl-evil-face))
 ;;;                                (and evil-mode (funcall separator-left pppp-face face-yel))
 ;;;;;;                                (funcall separator-left pppp-face pppp-face)
 ;;;;                                (powerline-raw (powerline-evil-tag) pppp-face face-yel)
@@ -241,15 +258,17 @@
                         (rhs
                             (list
                                 (funcall separator-right face1 mode-line)
-                                (powerline-raw (concat "%3c, %l/" (format "%d" (count-lines (point-min) (point-max))) " %4p ") mode-line)
+				;;  position
+;;				(powerline-raw (concat " [" (powerline-format-default-directory default-directory) "] ") mode-line)
+                                (powerline-raw (format " P:[%s] " (projectile-project-name))  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)))
+				;; pwd/workgroups
+                                (powerline-raw (concat "%3c, %l/" (format "%d" (count-lines (point-min) (point-max))) " %4p ") face-blue)
+;				                (funcall separator-right face-blue face1)
+                                ;; date and time
+;;;			                    (powerline-raw (format-time-string " %m-%d") face1 'r)
+                                (funcall separator-right face-blue face-yel)
+			                    (powerline-raw (format-time-string " %I:%M %p %m-%d %a ") face-yel 'r)))
                         (center
                             (list
                                 (powerline-raw " " face1)