X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=4ec5a060a4374d67a1af67f002eaa2bc9ba42cbd;hb=d4c67e31a1678a195a1c7d44f4b28fb1c590dede;hp=1be198c9c5d146dea6b6e2c7a7092f277778b693;hpb=b215e55934608a922e5f2bb22f33e4dc1410f550;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 1be198c..4ec5a06 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -583,12 +583,14 @@ Fix the issue in mode line when showing triangle
 set height in mode line
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (with-eval-after-load "powerline"
-    (let* ((base-font-size (face-attribute 'default :height)))
-      ;; 100/140;0.8
-      (set-variable 'powerline-height (/ base-font-size 10))
-      (set-variable 'powerline-text-scale-factor (/ (float 100) base-font-size)))
-    (set-face-attribute 'mode-line nil :height 100)
-    (set-face-attribute 'mode-line-inactive nil :height 100))
+    (if window-system
+        (progn 
+          (let* ((base-font-size (face-attribute 'default :height)))
+            ;; 100/140;0.8
+            (set-variable 'powerline-height (/ base-font-size 10))
+            (set-variable 'powerline-text-scale-factor (/ (float 100) base-font-size)))
+          (set-face-attribute 'mode-line nil :height 100)
+          (set-face-attribute 'mode-line-inactive nil :height 100))))
 #+END_SRC
 
 * IDO & SMEX
@@ -753,7 +755,8 @@ Always indents header, and hide header leading starts so that no need type =#+ST
                                  (sqlite . t)
                                  (js . t)
                                  (gnuplot . t)
-                                 (ditaa . t)))
+                                 (ditaa . t)
+                                 (plantuml . t)))
 
   ;; use current window for org source buffer editting
   (setq org-src-window-setup 'current-window )
@@ -773,6 +776,24 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     :ensure t)
 #+END_SRC
 
+*** plantUML
+[[http://eschulte.github.io/babel-dev/DONE-integrate-plantuml-support.html][DONE-integrate-plantuml-support]]
+#+BEGIN_SRC sh
+  ## support plantuml
+  brew install plantuml
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (use-package plantuml-mode
+    :ensure t)
+
+  (setq org-plantuml-jar-path
+        (expand-file-name "/usr/local/Cellar/plantuml/8041/plantuml.8041.jar"))
+
+  (set-variable 'plantuml-jar-path
+                (expand-file-name "/usr/local/Cellar/plantuml/8041/plantuml.8041.jar"))
+#+END_SRC
+
 ** Org-bullets
 use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8 charactes
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
@@ -786,7 +807,7 @@ use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8
   (setq org-bullets-bullet-list '("⦿" "✪" "◉" "○" "►" "◆"))
 
   ;; increase font size when enter org-src-mode
-  (add-hook 'org-src-mode-hook (lambda () (text-scale-increase 2)))
+  ;; (add-hook 'org-src-mode-hook (lambda () (text-scale-increase 2)))
 #+END_SRC
 
 ** Worf Mode
@@ -1080,6 +1101,11 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em
                '("C" "#+BEGIN_SRC c :tangle ?\n\n#+END_SRC"))
   (add-to-list 'org-structure-template-alist
                '("m" "\\begin{equation}\n?\n\\end{equation}"))
+
+  (add-to-list 'org-structure-template-alist
+               '("b" "#+STARTUP: showall
+  ,#+STARTUP: inlineimages
+  ,#+OPTIONS: toc:nil\n"))
 #+END_SRC
 
 ** Org theme
@@ -1146,11 +1172,10 @@ Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html]
            :sitemap-filename "sitemap.org" ;... call it sitemap.org (it's the default )...
            :sitemap-title "Sitemap"
 
-           :table-of-contents nil
-           :html-postamble nil            ;dont export creator auto validation info in html postamble div
+           :html-table-of-contents nil
+           :html-postamble nil ;dont export creator auto validation info in html postamble div
            :html-link-home "/"
-           :html-head "<link rel='stylesheet' href='./css/worg_old.css' />"
-           ;; :html-head-extra ,my-blog-extra-head
+           :html-head "<link rel='stylesheet' href='./css/worg.css' />"
            :html-head-include-default-style nil
            :html-head-include-scripts nil)
           ("org-static"
@@ -1158,7 +1183,8 @@ Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html]
            :base-extension "css\\|js\\|png\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
            :publishing-directory "~/Private/publish_html"
            :recursive t
-           :publishing-function org-publish-attachment)
+           :publishing-function org-publish-attachment
+           :table-of-contents nil)
           ("org" :components ("org-notes" "org-static"))))
 #+END_SRC
 
@@ -1641,7 +1667,12 @@ as a http download client tool
     :config
     (elscreen-start)
     (set-face-attribute 'elscreen-tab-current-screen-face nil :foreground "black" :background "yellow")
-    (set-face-attribute 'elscreen-tab-other-screen-face nil :foreground "black" :background "disabledControlTextColor" :underline nil))
+    (set-face-attribute 'elscreen-tab-other-screen-face nil :foreground "black" :background "disabledControlTextColor" :underline nil)
+    ;; (global-unset-key (kbd)); M-TAB switch screen
+    (global-set-key (kbd "s-`") '(lambda () (interactive) (elscreen-goto 0)))
+    (dotimes (i 8)
+      (global-set-key (kbd (concat "s-" (number-to-string (+ i 1))))
+                      `(lambda () (interactive) (elscreen-goto ,(+ i 1))))))
 #+END_SRC
 
 * Dired
@@ -3431,3 +3462,4 @@ search music on some music web site
 
 
 
+** Need separate the Key-bindings and package-initialization