X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=543d3873927d5958132c6984f98ba649fd9cea56;hb=928ddf4d7b361a66f0d3aba2874f1906cbf43f3f;hp=041cf0685238dcab414a022b9d8822ba0ded3a3b;hpb=899755001c88619152b2794e6d1383d8a831ba87;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 041cf06..543d387 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -520,7 +520,7 @@ use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8
               (lambda ()
                 (org-bullets-mode t))))
 
-  (setq org-bullets-bullet-list '("⦿" "✪" "⚫" "◉" "○" "►" "◆"))
+  (setq org-bullets-bullet-list '("⦿" "✪" "◉" "○" "►" "◆"))
 #+END_SRC
 
 ** Worf Mode
@@ -720,7 +720,6 @@ Setting agenda files and the agenda view
   (setq org-agenda-show-all-dates t)
 #+END_SRC
 
-
 ** Export PDF
 
 Install MacTex-basic and some tex packages
@@ -835,6 +834,20 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em
 
 #+END_SRC
 
+Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github.com/abo-abo/oremacs/blob/c5cafdcebc88afe9e73cc8bd40c49b70675509c7/modes/ora-nextmagit.el][here]]
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (dolist (map (list magit-status-mode-map
+                     magit-log-mode-map
+                     magit-diff-mode-map
+                     magit-staged-section-map))
+    (define-key map "j" 'magit-section-forward)
+    (define-key map "k" 'magit-section-backward)
+    (define-key map "n" nil)
+    (define-key map "p" nil)
+    (define-key map "v" 'recenter-top-bottom)
+    (define-key map "i" 'magit-section-toggle))
+#+END_SRC
+
 * IDO & SMEX
 
 ** IDO
@@ -1191,7 +1204,6 @@ Eshell alias
 Quickly start eshll in split window below, refer [[http://www.howardism.org/Technical/Emacs/eshell-fun.html][eshell-here]]
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (defun eshell-x ()
     (insert "exit")
     (eshell-send-input)
@@ -1224,7 +1236,6 @@ Quickly start eshll in split window below, refer [[http://www.howardism.org/Tech
   ;; (global-set-key (kbd "M-`") (lambda ()
   ;;                               (interactive)
   ;;                               (if (buffer-name))))
-
 #+END_SRC
 
 * Misc Settings
@@ -1232,21 +1243,20 @@ Quickly start eshll in split window below, refer [[http://www.howardism.org/Tech
 ** [[https://github.com/abo-abo/hydra][Hydra]]
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (use-package hydra
     :ensure t)
-
+  ;; disable new line in minibuffer when hint hydra
+  (setq hydra-lv nil)
 #+END_SRC
 
 *** Font Zoom
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
+    (defhydra sd/font-zoom (global-map "<f2>")
 
-  (defhydra sd/font-zoom (global-map "<f2>")
     "zoom"
     ("g" text-scale-increase "in")
     ("l" text-scale-decrease "out"))
-
 #+END_SRC
 
 *** Windmove Splitter
@@ -1292,7 +1302,6 @@ Refer [[https://github.com/abo-abo/hydra/blob/master/hydra-examples.el][hydra-ex
 *** hydra-window
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (winner-mode 1)
 
   (defhydra sd/hydra-window (:color red :columns nil)
@@ -1321,14 +1330,14 @@ Refer [[https://github.com/abo-abo/hydra/blob/master/hydra-examples.el][hydra-ex
     ("d" ace-delete-window "ace-one" :exit t)
     ("i" ace-maximize-window "ace-one" :exit t)
     ("b" ido-switch-buffer "buf")
-    ("m" headlong-bookmark-jump "bmk")
+    ;; ("m" headlong-bookmark-jump "bmk")
     ("q" nil "cancel")
     ("u" (progn (winner-undo) (setq this-command 'winner-undo)) "undo")
     ("r" (progn (winner-redo) (setq this-command 'winner-redo)) "redo")
     ("f" nil))
 
-  (global-unset-key (kbd "M-o"))
-  (global-set-key (kbd "M-o") 'sd/hydra-window/body)
+  (global-unset-key (kbd "C-o"))
+  (global-set-key (kbd "C-o") 'sd/hydra-window/body)
 
   (defun triggle-windows-max-size ()
     (interactive)