X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=f994a174b452fa47b8f0115d5de931a821de216e;hb=f55bf553451190a0fa6953140507412ac40d3f55;hp=e17a4e452440608d8db8ae1814de922940020c0c;hpb=82594283f51cf1181d36d8afd8dc40a781ec432f;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index e17a4e4..f994a17 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -155,15 +155,11 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. #+END_SRC ** Smart Comments - [[https://github.com/paldepind/smart-comment][smart-comments]] - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package smart-comment :ensure t :bind ("M-;" . smart-conmment)) - #+END_SRC ** Font Setting @@ -185,11 +181,11 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. Setting the fonts alignment issue #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (if window-system - (when sd/fixed-font-family - (set-frame-font sd/fixed-font-family) - (set-face-attribute 'default nil :font sd/fixed-font-family :height 120) - (set-face-font 'default sd/fixed-font-family))) + (if window-system + (when sd/fixed-font-family + (set-frame-font sd/fixed-font-family) + (set-face-attribute 'default nil :font sd/fixed-font-family :height 140) + (set-face-font 'default sd/fixed-font-family))) #+END_SRC *** Chinese fonts @@ -586,13 +582,13 @@ Fix the issue in mode line when showing triangle set height in mode line #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (set-variable 'powerline-height 14) - (set-variable 'powerline-text-scale-factor (/ (float 100) 140)) - ;; (custom-set-variables - ;; '(powerline-height 14) - ;; '(powerline-text-scale-factor (/ (float 100) 140))) - ;; 100/140;0.8 - (set-face-attribute 'mode-line nil :height 100) + (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)) #+END_SRC * IDO & SMEX @@ -730,8 +726,8 @@ Always indents header, and hide header leading starts so that no need type =#+ST (setq org-completion-use-ido t) (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-startup-with-latex-preview t) + ;; (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) @@ -1090,7 +1086,7 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em [[https://yoo2080.wordpress.com/2013/05/30/monospace-font-in-tables-and-source-code-blocks-in-org-mode-proportional-font-in-other-parts/][monospace font in tables and source code blocks in org-mode, proportional font in other parts]] #+BEGIN_SRC emacs-lisp :tangle yes :results silent (set-face-attribute 'variable-pitch nil :font "Calibri" :height 160) - (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height 120) + (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height (face-attribute 'default :height)) (add-hook 'text-mode-hook 'variable-pitch-mode) @@ -1099,16 +1095,58 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em (mapc (lambda (face) (set-face-attribute face nil :inherit 'fixed-pitch)) (list 'org-code 'org-block 'org-block-background)) - (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 120) + (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 140) + ;; fix indent broken by variable-pitch-mode ;; http://emacs.stackexchange.com/questions/26864/variable-pitch-face-breaking-indentation-in-org-mode (require 'org-indent) (set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch))) #+END_SRC -*** Org-head face - +Also correct the face of =org-meta-line= in =org-table= +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (with-eval-after-load "org" + (set-face-attribute 'org-meta-line nil :font "Source Code Pro" :height 120 :slant 'italic :inherit 'font-lock-comment-face)) +#+END_SRC +*** Org-head face +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (with-eval-after-load "org" + (let* ((base-height (face-attribute 'variable-pitch :height)) + (base-font-color (face-foreground 'default nil 'default))) + (set-face-attribute 'org-document-title nil :weight 'bold :height (+ 60 base-height)) + (set-face-attribute 'org-level-1 nil :weight 'bold :height (+ 40 base-height)) + (set-face-attribute 'org-level-2 nil :weight 'bold :height (+ 30 base-height)) + (set-face-attribute 'org-level-3 nil :weight 'bold :height (+ 20 base-height)) + (set-face-attribute 'org-level-4 nil :weight 'bold :height (+ 10 base-height)) + (set-face-attribute 'org-level-5 nil :weight 'bold) + (set-face-attribute 'org-level-6 nil :weight 'bold) + (set-face-attribute 'org-level-7 nil :weight 'bold) + (set-face-attribute 'org-level-8 nil :weight 'bold))) +#+END_SRC + +** Org Blog +Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html][org-publish-html-tutorial]] +#+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 + :auto-preamble t) + ("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) + ("org" :components ("org-notes" "org-static")))) +#+END_SRC * Magit [[https://github.com/magit/magit][Magit]] is a very cool git interface on Emacs. and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github.com/abo-abo/oremacs/blob/c5cafdcebc88afe9e73cc8bd40c49b70675509c7/modes/ora-nextmagit.el][here]] @@ -1793,7 +1831,7 @@ here on Mac, just use "open" commands to pen =.pdf=, =.html= and image files (define-key company-active-map [tab] #'company-complete-selection) (global-company-mode) ;; magig-commit is text-modeh - (setq company-global-modes '(not org-mode magit-status-mode text-mode))) + (setq company-global-modes '(not org-mode magit-status-mode text-mode eshell-mode))) (use-package company-statistics :ensure t @@ -3358,10 +3396,11 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828 #+END_SRC * TODO todolist -** rucket +** Rucket ** player video on iphone for ** SICP ** music searcher search music on some music web site +