X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=df87ab38d7ed2b6d43d3f352daadb7ba4001b586;hb=a6ed1fffae5d45498cfb0b7b5bd642823597f6f5;hp=1182d1a732f7b57bf6831b1b343ce53154c6cfb0;hpb=1683b18354daf994e27727c4103e6f92704f5a17;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 1182d1a..df87ab3 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -31,11 +31,11 @@ Set system PATH and emacs exec path
 ** General Setting
 *** scroll bar, tool-bar and menu-bar
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (scroll-bar-mode 0)
-  (tool-bar-mode 0)
-
-  (if window-system
-      (menu-bar-mode 1)
+  (if (display-graphic-p)
+      (progn
+        (scroll-bar-mode 0)
+        (tool-bar-mode 0)
+        (menu-bar-mode 1))
     (menu-bar-mode 0))
 
   (setq debug-on-error t)
@@ -737,7 +737,7 @@ Always indents header, and hide header leading starts so that no need type =#+ST
   (setq org-ditaa-jar-path "/usr/local/Cellar/ditaa/0.9/libexec/ditaa0_9.jar")
   (unless 
       (file-exists-p org-ditaa-jar-path)
-    (error "seudut: ditaa.jar not found at %s " org-ditaa-jar-path))
+    (warn "seudut: ditaa.jar not found at %s " org-ditaa-jar-path))
 
   (org-babel-do-load-languages 'org-babel-load-languages
                                '((python . t)
@@ -1183,37 +1183,47 @@ Also correct the face of  =org-meta-line= in =org-table=
 ** Org Blog
 Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html][org-publish-html-tutorial]], and [[https://ogbe.net/blog/blogging_with_org.html][blogging_with_org]]
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (require 'ox-publish)
-
-  (setq org-publish-project-alist
-        `(
-          ("org-notes"
-           :base-directory "~/Private/blog/"
-           :base-extension "org"
-           :publishing-directory "~/Private/publish_html"
-           :recursive t
-           :publishing-function org-html-publish-to-html
-           :headline-levels 4
-           :section-numbers nil
-           :auto-preamble t
-           :auto-sitemap t          ;Generate sitmap.org automagicaly...
-           :sitemap-filename "sitemap.org" ;... call it sitemap.org (it's the default )...
-           :sitemap-title "Sitemap"
-
-           :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.css' />"
-           :html-head-include-default-style nil
-           :html-head-include-scripts nil)
-          ("org-static"
-           :base-directory "~/Private/blog/"
-           :base-extension "css\\|js\\|png\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
-           :publishing-directory "~/Private/publish_html"
-           :recursive t
-           :publishing-function org-publish-attachment
-           :table-of-contents nil)
-          ("org" :components ("org-notes" "org-static"))))
+  ;; (require 'ox-publish)
+
+  ;; ;; constants
+  ;; (defconst blog-dir "~/Private/blog/")
+  ;; ;; (defconst blog-dir (file-name-directory (or load-file-name buffer-file-name)))
+  ;; (defconst publish-dir (concat blog-dir "_site/"))
+  ;; (defconst css-file "../css/worg.css")
+  ;; ;; (defconst css-file (concat root-dir "css/worg.css"))
+
+  ;; ;; To prevent inline-css when exporting html. will use external css
+  ;; (setq org-html-htmlize-output-type 'css)
+
+  ;; (setq org-publish-project-alist
+  ;;       `(
+  ;;         ("org-notes"
+  ;;          :base-directory ,blog-dir
+  ;;          :base-extension "org"
+  ;;          :publishing-directory ,publish-dir
+  ;;          :recursive t
+  ;;          :publishing-function org-html-publish-to-html
+  ;;          :headline-levels 4
+  ;;          :section-numbers nil
+  ;;          :auto-preamble t
+  ;;          :auto-sitemap t          ;Generate sitmap.org automagicaly...
+  ;;          :sitemap-filename "sitemap.org" ;... call it sitemap.org (it's the default )...
+  ;;          :sitemap-title "Sitemap"
+
+  ;;          :html-table-of-contents nil
+  ;;          :html-postamble nil ;dont export creator auto validation info in html postamble div
+  ;;          :html-link-home "/"
+  ;;          :html-head ,(concat  "<link rel='stylesheet' href='" css-file "' />")
+  ;;          :html-head-include-default-style nil
+  ;;          :html-head-include-scripts nil)
+  ;;         ("org-static"
+  ;;          :base-directory "~/Private/blog/"
+  ;;          :base-extension "css\\|js\\|png\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
+  ;;          :publishing-directory ,publish-dir
+  ;;          :recursive t
+  ;;          :publishing-function org-publish-attachment
+  ;;          :table-of-contents nil)
+  ;;         ("org" :components ("org-notes" "org-static"))))
 #+END_SRC
 
 * Magit
@@ -2605,37 +2615,37 @@ Then Run =M-x gnus=
 
 ** Group buffer
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (use-package gnus
-    :init
-    (setq gnus-permanently-visible-groups "\.*")
-    :config
-    (cond (window-system
-           (setq custom-background-mode 'light)
-           (defface my-group-face-1
-             '((t (:foreground "Red" :bold t))) "First group face")
-           (defface my-group-face-2
-             '((t (:foreground "DarkSeaGreen4" :bold t)))
-             "Second group face")
-           (defface my-group-face-3
-             '((t (:foreground "Green4" :bold t))) "Third group face")
-           (defface my-group-face-4
-             '((t (:foreground "SteelBlue" :bold t))) "Fourth group face")
-           (defface my-group-face-5
-             '((t (:foreground "Blue" :bold t))) "Fifth group face")))
-    (setq gnus-group-highlight
-          '(((> unread 200) . my-group-face-1)
-            ((and (< level 3) (zerop unread)) . my-group-face-2)
-            ((< level 3) . my-group-face-3)
-            ((zerop unread) . my-group-face-4)
-            (t . my-group-face-5))))
-
-
-  ;; key-
-  (add-hook 'gnus-group-mode-hook (lambda ()
-                                    (define-key gnus-group-mode-map "k" 'gnus-group-prev-group)
-                                    (define-key gnus-group-mode-map "j" 'gnus-group-next-group)
-                                    (define-key gnus-group-mode-map "g" 'gnus-group-jump-to-group)
-                                    (define-key gnus-group-mode-map "v" (lambda () (interactive) (gnus-group-select-group t)))))
+  ;; (use-package gnus
+  ;;   :init
+  ;;   (setq gnus-permanently-visible-groups "\.*")
+  ;;   :config
+  ;;   (cond (window-system
+  ;;          (setq custom-background-mode 'light)
+  ;;          (defface my-group-face-1
+  ;;            '((t (:foreground "Red" :bold t))) "First group face")
+  ;;          (defface my-group-face-2
+  ;;            '((t (:foreground "DarkSeaGreen4" :bold t)))
+  ;;            "Second group face")
+  ;;          (defface my-group-face-3
+  ;;            '((t (:foreground "Green4" :bold t))) "Third group face")
+  ;;          (defface my-group-face-4
+  ;;            '((t (:foreground "SteelBlue" :bold t))) "Fourth group face")
+  ;;          (defface my-group-face-5
+  ;;            '((t (:foreground "Blue" :bold t))) "Fifth group face")))
+  ;;   (setq gnus-group-highlight
+  ;;         '(((> unread 200) . my-group-face-1)
+  ;;           ((and (< level 3) (zerop unread)) . my-group-face-2)
+  ;;           ((< level 3) . my-group-face-3)
+  ;;           ((zerop unread) . my-group-face-4)
+  ;;           (t . my-group-face-5))))
+
+
+  ;; ;; key-
+  ;; (add-hook 'gnus-group-mode-hook (lambda ()
+  ;;                                   (define-key gnus-group-mode-map "k" 'gnus-group-prev-group)
+  ;;                                   (define-key gnus-group-mode-map "j" 'gnus-group-next-group)
+  ;;                                   (define-key gnus-group-mode-map "g" 'gnus-group-jump-to-group)
+  ;;                                   (define-key gnus-group-mode-map "v" (lambda () (interactive) (gnus-group-select-group t)))))
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
@@ -2751,66 +2761,68 @@ Then, run =mu index --maildir=~/.Mail=
 ** Mu4e - Emacs frontend of Mu
 config from [[http://www.kirang.in/2014/11/13/emacs-as-email-client-with-offlineimap-and-mu4e-on-osx/][emacs-as-email-client-with-offlineimap-and-mu4e-on-osx]]
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (require 'mu4e)
-  (setq mu4e-maildir "~/.Mail")
-  (setq mu4e-drafts-folder "/[Gmail].Drafts")
-  (setq mu4e-sent-folder   "/[Gmail].Sent Mail")
-  ;; don't save message to Sent Messages, Gmail/IMAP takes care of this
-  (setq mu4e-sent-messages-behavior 'delete)
-  ;; allow for updating mail using 'U' in the main view:
-  (setq mu4e-get-mail-command "offlineimap")
-
-  ;; shortcuts
-  (setq mu4e-maildir-shortcuts
-      '( ("/INBOX"               . ?i)
-         ("/[Gmail].Sent Mail"   . ?s)))
-
-  ;; something about ourselves
-  (setq
-     user-mail-address "seudut@gmail.com"
-     user-full-name  "Peng Li"
-     mu4e-compose-signature
-      (concat
-        "Thanks,\n"
-        "Peng\n"))
-
-  ;; show images
-  (setq mu4e-show-images t)
-
-  ;; use imagemagick, if available
-  (when (fboundp 'imagemagick-register-types)
-    (imagemagick-register-types))
-
-  ;; convert html emails properly
-  ;; Possible options:
-  ;;   - html2text -utf8 -width 72
-  ;;   - textutil -stdin -format html -convert txt -stdout
-  ;;   - html2markdown | grep -v '&nbsp_place_holder;' (Requires html2text pypi)
-  ;;   - w3m -dump -cols 80 -T text/html
-  ;;   - view in browser (provided below)
-  (setq mu4e-html2text-command "textutil -stdin -format html -convert txt -stdout")
-
-  ;; spell check
-  (add-hook 'mu4e-compose-mode-hook
-          (defun my-do-compose-stuff ()
-             "My settings for message composition."
-             (set-fill-column 72)
-             (flyspell-mode)))
-
-  ;; add option to view html message in a browser
-  ;; `aV` in view to activate
-  (add-to-list 'mu4e-view-actions
-    '("ViewInBrowser" . mu4e-action-view-in-browser) t)
-
-  ;; fetch mail every 10 mins
-  (setq mu4e-update-interval 600)
-
-  ;; mu4e view
-  (setq-default mu4e-headers-fields '((:flags . 6)
-                                      (:from-or-to . 22)
-                                      (:mailing-list . 20)
-                                      (:thread-subject . 70)
-                                      (:human-date . 16)))
+  (if (require 'mu4e nil 'noerror)
+      (progn
+        (setq mu4e-maildir "~/.Mail")
+        (setq mu4e-drafts-folder "/[Gmail].Drafts")
+        (setq mu4e-sent-folder   "/[Gmail].Sent Mail")
+        ;; don't save message to Sent Messages, Gmail/IMAP takes care of this
+        (setq mu4e-sent-messages-behavior 'delete)
+        ;; allow for updating mail using 'U' in the main view:
+        (setq mu4e-get-mail-command "offlineimap")
+
+        ;; shortcuts
+        (setq mu4e-maildir-shortcuts
+              '( ("/INBOX"               . ?i)
+                 ("/[Gmail].Sent Mail"   . ?s)))
+
+        ;; something about ourselves
+        (setq
+         user-mail-address "seudut@gmail.com"
+         user-full-name  "Peng Li"
+         mu4e-compose-signature
+         (concat
+          "Thanks,\n"
+          "Peng\n"))
+
+        ;; show images
+        (setq mu4e-show-images t)
+
+        ;; use imagemagick, if available
+        (when (fboundp 'imagemagick-register-types)
+          (imagemagick-register-types))
+
+        ;; convert html emails properly
+        ;; Possible options:
+        ;;   - html2text -utf8 -width 72
+        ;;   - textutil -stdin -format html -convert txt -stdout
+        ;;   - html2markdown | grep -v '&nbsp_place_holder;' (Requires html2text pypi)
+        ;;   - w3m -dump -cols 80 -T text/html
+        ;;   - view in browser (provided below)
+        (setq mu4e-html2text-command "textutil -stdin -format html -convert txt -stdout")
+
+        ;; spell check
+        (add-hook 'mu4e-compose-mode-hook
+                  (defun my-do-compose-stuff ()
+                    "My settings for message composition."
+                    (set-fill-column 72)
+                    (flyspell-mode)))
+
+        ;; add option to view html message in a browser
+        ;; `aV` in view to activate
+        (add-to-list 'mu4e-view-actions
+                     '("ViewInBrowser" . mu4e-action-view-in-browser) t)
+
+        ;; fetch mail every 10 mins
+        (setq mu4e-update-interval 600)
+
+        ;; mu4e view
+        (setq-default mu4e-headers-fields '((:flags . 6)
+                                            (:from-or-to . 22)
+                                            (:mailing-list . 20)
+                                            (:thread-subject . 70)
+                                            (:human-date . 16))))
+    (warn "seudut:mu4e not installed, it won't work."))
 #+END_SRC
 
 ** Smtp - send mail
@@ -2834,6 +2846,14 @@ config from [[http://www.kirang.in/2014/11/13/emacs-as-email-client-with-offline
     (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display))
 #+END_SRC
 
+* Modes
+** Yaml-mode
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (use-package yaml-mode
+    :ensure t
+    :init
+    (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)))
+#+END_SRC
 * Entertainment
 ** GnuGo
 Play Go in Emacs, gnugo xpm refert [[https://github.com/okanotor/dotemacs/blob/f95b774cb292d1169748bc0a62ba647bbd8c0652/etc/my-inits/my-inits-gnugo.el][to here]]. start at image display mode and grid mode
@@ -3497,12 +3517,15 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828
 
   (global-set-key (kbd "C-w") 'sd/kill-region-or-backward-kill-word)
 #+END_SRC
+
 * Developing
 ** perspeen
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (el-get-bundle seudut/perspeen
-    :features perspeen
-    (setq perspeen-use-tab t)
+  (use-package perspeen
+    :ensure t
+    :init
+    (setq perspeen-use-tab nil)
+    :config
     (perspeen-mode))
 
   ;; super-i to switch to ith workspace
@@ -3523,6 +3546,7 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828
     (define-key perspeen-mode-map (kbd "s-t") 'perspeen-tab-create-tab)
     (define-key perspeen-mode-map (kbd "s-t") 'perspeen-tab-create-tab))
 #+END_SRC
+
 * TODO todolist
 ** Rucket
 ** player video on iphone for