re-construct evil config

[dotfiles.git] / emacs.d / config.org

diff --git a/emacs.d/config.org b/emacs.d/config.org
index d600632..f504edc 100644 (file)
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -422,6 +422,8 @@ clean mode line, Refer to [[https://www.masteringemacs.org/article/hiding-replac
       (irony-mode . "")
       (page-break-lines-mode . "")
       (yas-minor-mode . "y")
+      ;; default jj
+      (evil-escape-mode . "")
       ;; Major modes
       (lisp-interaction-mode . "λ")
       (hi-lock-mode . "")
@@ -533,17 +535,6 @@ Revised powerline-center-theme
                                        (powerline-narrow face1 'l)
                                        ;; (powerline-vc face1)
                                        (sd/powerline-simpler-vc (powerline-vc face1))))
-                            (center (list (powerline-raw " " face1)
-                                          (funcall separator-right face1 face2)
-                                          ;; (when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode)
-                                          ;;   (powerline-raw erc-modified-channels-object face2 'l))
-                                          ;; (powerline-major-mode face2 'l)
-                                          ;; (powerline-process face2)
-                                          ;; (powerline-raw " :" face2)
-                                          ;; (powerline-minor-modes face2 'l)
-                                          ;; (powerline-buffer-id mode-line-buffer-id face2 'l)
-                                          ;; (powerline-raw " " face2)
-                                          (funcall separator-left face2 face1)))
                             (rhs (list (powerline-raw global-mode-string face1 'r)
                                        (powerline-raw "%4l" face1 'r)
                                        (powerline-raw ":" face1)     
@@ -553,7 +544,18 @@ Revised powerline-center-theme
                                        (powerline-raw (format-time-string " %I:%M %p  ") my-face1 'r)
                                        ;; (powerline-raw "%6p" my-face1 'r)
                                        ;; (powerline-hud my-face1 face1 )
-                                       )))
+                                       ))
+                            (center (list (powerline-raw " " face1)
+                                          (funcall separator-left face1 face2)
+                                          (powerline-raw (when  (and (boundp 'evil-mode)  evil-mode) evil-mode-line-tag) face2)
+                                          (when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode)
+                                            (powerline-raw erc-modified-channels-object face2 'l))
+                                          (powerline-major-mode face2 'l)
+                                          (powerline-process face2)
+                                          (powerline-raw " :" face2)
+                                          (powerline-minor-modes face2 'l)
+                                          (powerline-raw " " face2)
+                                          (funcall separator-right face2 face1))))
                        (concat (powerline-render lhs)
                                (powerline-fill-center face1 (/ (powerline-width center) 2.0))
                                (powerline-render center)
@@ -561,11 +563,6 @@ Revised powerline-center-theme
                                (powerline-render rhs)))))))
 
   (sd/powerline-center-theme_revised)
-
-
-  ;; local test
-  ;; (add-to-list 'load-path "~/.emacs.d/")
-  ;; (require 'my-mode-line)
 #+END_SRC
 
 Fix the issue in mode line when showing triangle 
@@ -795,9 +792,7 @@ use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8
   (use-package org-bullets
     :ensure t
     :init
-    (add-hook 'org-mode-hook
-              (lambda ()
-                (org-bullets-mode t))))
+    (add-hook 'org-mode-hook (apply-partially #'org-bullets-mode t)))
 
   (setq org-bullets-bullet-list '("⦿" "✪" "◉" "○" "►" "◆"))
 
@@ -1262,8 +1257,9 @@ set default eshell history folder
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (require 'utilities)
 
-  (add-hook 'eshell-mode-hook (lambda ()
-                                (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer)))
+  ;; (add-hook 'eshell-mode-hook (lambda ()
+  ;;                               (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer)))
+  (add-hook 'eshell-mode-hook (apply-partially #'local-set-key (kbd "C-l") 'sd/eshell-clear-buffer))
 #+END_SRC
 
 ** Toggle Eshell
@@ -2120,9 +2116,7 @@ bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questi
       (define-key lispy-mode-map (kbd "G") 'special-lispy-goto)
       (define-key lispy-mode-map (kbd "M-m") 'back-to-indentation))
     :config
-    (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1))))
-
-
+    (add-hook 'emacs-lisp-mode-hook (apply-partially #'lispy-mode 1)))
 #+END_SRC
 
 ** Perl
@@ -2142,9 +2136,7 @@ bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questi
   (setq cperl-tab-always-indent t)
   ;(setq cperl-brace-offset  0)
 
-  (add-hook 'cperl-mode-hook
-            '(lambda ()
-               (cperl-set-style "C++")))
+  (add-hook 'cperl-mode-hook (apply-partially #'cperl-set-style "C++"))
 
   (defalias 'perldoc 'cperl-perldoc)
 #+END_SRC
@@ -2680,8 +2672,9 @@ Then Run =M-x gnus=
   ;; (with-eval-after-load 'gnus-summary-mode
   ;;   (define-key gnus-summary-mode-map (kbd "C-o") 'sd/hydra-window/body))
 
-  (add-hook 'gnus-summary-mode-hook (lambda ()
-                                      (define-key gnus-summary-mode-map (kbd "C-o") nil)))
+  ;; (add-hook 'gnus-summary-mode-hook (lambda ()
+  ;;                                     (define-key gnus-summary-mode-map (kbd "C-o") nil)))
+  ;(add-hook 'gnus-summary-mode-hook (apply-partially #'define-key gnus-summary-mode-map (kbd "C-o") nil))
 
 
 #+END_SRC
@@ -3529,8 +3522,7 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828
 #+END_SRC
 * Evil Mode
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  ;; (org-babel-load-file "~/.emacs.d/emacs-evil.org")
-  ;; (require 'init-evil-mode)
+  (org-babel-load-file "~/.emacs.d/emacs-evil.org")
 #+END_SRC