X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=8dce4e6d9d7050e623512b4f48114a039c42f938;hb=4a6d433113fc61126d3998c5bdfcfbb2bd8de085;hp=2a9eb569dc6f81f7e7cadec9a2e2ca0013a34af3;hpb=5b649e9e1f9cd0768cb774329a4ae0fa92715059;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 2a9eb56..8dce4e6 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -33,7 +33,10 @@ Set system PATH and emacs exec path
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (scroll-bar-mode 0)
   (tool-bar-mode 0)
-  (menu-bar-mode 1)
+
+  (if window-system
+      (menu-bar-mode 1)
+    (menu-bar-mode 0))
 
   ;; (setq debug-on-error t)
   (setq inhibit-startup-message t)
@@ -245,11 +248,21 @@ Fix the font alignment issue when both Chinese and English hybird in org-mode ta
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   ;; Setup font size based on emacs-font-size-pair
-  (set-font emacs-english-font emacs-cjk-font '(13 . 16))
+  (if window-system
+      (set-font emacs-english-font emacs-cjk-font '(13 . 16)))
+  ;  
 
-  ;; (global-set-key (kbd "s-=") 'increase-emacs-font-size)
-  ;; (global-set-key (kbd "s--") 'decrease-emacs-font-size)
+    ;; (global-set-key (kbd "s-=") 'increase-emacs-font-size)
+    ;; (global-set-key (kbd "s--") 'decrease-emacs-font-size)
+
+    ;; set different fonts (chinese) size for org-mode.
+    (defun sd/org-buffer-font ()
+      "My font setting for org-mode"
+      (interactive)
+      (setq buffer-face-mode-face '(:family "cjk-misc" :font "STHeiti" :height 160))
+      (buffer-face-mode))
 
+    ;; (add-hook 'org-mode-hook 'sd/org-buffer-font)
 #+END_SRC
 
 ** Color Theme
@@ -718,7 +731,10 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     (setq org-startup-with-inline-images t)
     ;; latex preview
     (setq org-startup-with-latex-preview t)
-    (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.2)))
+    (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.2))
+    (require 'org-habit)
+    (add-to-list 'org-modules 'org-habit)
+    (setq org-habit-graph-column 50))
 
   (el-get-bundle hasu/emacs-ob-racket
     :features ob-racket)
@@ -944,9 +960,9 @@ Setting agenda files and the agenda view
                                  "~/org/work.org")))
 
   ;; only show today's tasks in agenda view
-  (setq org-agenda-span 'day)
+  ;; (setq org-agenda-span 'day)
   ;; Use current windows for agenda view
-  (setq org-agenda-window-setup 'current-window)
+  ;; (setq org-agenda-window-setup 'current-window)
 
   ;; show all feature entries for repeating tasks,
   ;; this is already setting by default
@@ -1249,29 +1265,21 @@ Refer [[https://github.com/abo-abo/hydra/blob/master/hydra-examples.el][hydra-ex
 #+END_SRC
 
 ** Line Number
-
 Enable linum mode on programming modes
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (add-hook 'prog-mode-hook 'linum-mode)
-  ;; (add-hook 'prog-mode-hook (lambda ()
-  ;;                             (setq-default indicate-empty-lines t)))
 #+END_SRC
 
 Fix the font size of line number
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (defun fix-linum-size ()
-       (interactive)
-       (set-face-attribute 'linum nil :height 110))
+    (interactive)
+    (set-face-attribute 'linum nil :height 110))
 
   (add-hook 'linum-mode-hook 'fix-linum-size)
-
 #+END_SRC
 
 I like [[https://github.com/coldnew/linum-relative][linum-relative]], just like the =set relativenumber= on =vim=
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (use-package linum-relative
     :ensure t
@@ -1294,14 +1302,11 @@ I like [[https://github.com/coldnew/linum-relative][linum-relative]], just like
 #+END_SRC
 
 ** Save File Position
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (require 'saveplace)
   (setq-default save-place t)
   (setq save-place-forget-unreadable-files t)
   (setq save-place-skip-check-regexp "\\`/\\(?:cdrom\\|floppy\\|mnt\\|/[0-9]\\|\\(?:[^@/:]*@\\)?[^@/:]*[^@/:.]:\\)")
-
 #+END_SRC
 
 ** Multi-term
@@ -1424,9 +1429,7 @@ When see function by =C-h f=, and visit the source code, I would like the buffer
     (unless (equal major-mode 'Info-mode)
       (unless (> (length (window-list)) 1)
         (split-window-right))
-      (other-window 1)
-      ;; (info)
-      ))
+      (other-window 1)))
 
   ;; open Info buffer in other window instead of current window
   (defadvice info (before my-info (&optional file buf) activate)
@@ -1438,13 +1441,8 @@ When see function by =C-h f=, and visit the source code, I would like the buffer
 
 ** Demo It
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  ;; (el-get-bundle howardabrams/demo-it)
-
   (use-package org-tree-slide
     :ensure t)
-
-  ;; (use-package yasnippet
-  ;;   :ensure t)
 #+END_SRC
 
 ** Presentation