X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=bf6e85ca38fe1b5e421a79993a8f78138cc4fe06;hb=5dfbb4e081492aaff24b9319579105787f8c0115;hp=4e4968576dd70addb5d92d1028a609e2ba7f8b47;hpb=d0ca94df3b13cde1de1e88b897d34b68d1081c80;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 4e49685..bf6e85c 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 @@ -586,13 +582,12 @@ 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-variable 'powerline-height 14) + (set-variable 'powerline-text-scale-factor (/ (float 100) 120)) + (set-face-attribute 'mode-line nil :height 100) + (set-face-attribute 'mode-line-inactive nil :height 100) #+END_SRC * IDO & SMEX @@ -730,8 +725,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) @@ -1086,6 +1081,8 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em #+END_SRC ** Org theme +*** variable-pitch-mode and fixed-pitch-mode +[[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) @@ -1094,30 +1091,37 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em ;; Install Ubuntu Mono fonts and apply it in org-table to align Chinese fonts (with-eval-after-load "org" - (set-face-attribute 'org-code nil :inherit 'fixed-pitch) - (set-face-attribute 'org-block nil :inherit 'fixed-pitch) - (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 120) - (set-face-attribute 'org-block-background nil :inherit 'fixed-pitch) + (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 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 -*** variable-pich mode -[[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]] +Also correct the face of =org-meta-line= in =org-table= #+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 130) - - - ;; (add-hook 'text-mode-hook 'variable-pitch-mode) + (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 - ;; monospace mode for block in org-mode - ;; (with-eval-after-load "org" - ;; (mapc (lambda (face) - ;; (set-face-attribute face nil :inherit 'fixed-pitch)) - ;; (list 'org-code 'org-block 'org-table 'org-block-background))) +*** 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 * Magit @@ -1799,11 +1803,12 @@ here on Mac, just use "open" commands to pen =.pdf=, =.html= and image files (define-key company-active-map (kbd "M-p") nil) (define-key company-active-map (kbd "C-n") #'company-select-next) (define-key company-active-map (kbd "C-p") #'company-select-previous) - ;; should map both (kbd "TAB") and [tab],https://github.com/company-mode/company-mode/issues/75 + ;; should map both (kbd "TAB") and [tab],https://github.com/company-mode/company-mode/issues/75 (define-key company-active-map (kbd "TAB") #'company-complete-selection) (define-key company-active-map [tab] #'company-complete-selection) (global-company-mode) - (setq company-global-modes '(not org-mode magit-status-mode))) + ;; magig-commit is text-modeh + (setq company-global-modes '(not org-mode magit-status-mode text-mode))) (use-package company-statistics :ensure t @@ -3368,10 +3373,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 +