X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=9660544b782c37399bf7b8c1d6d170cc6d3a8efd;hb=f4681ea8ee1b8282511f6b2d6c15c01c920b6caa;hp=2a9eb569dc6f81f7e7cadec9a2e2ca0013a34af3;hpb=5b649e9e1f9cd0768cb774329a4ae0fa92715059;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 2a9eb56..9660544 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) @@ -174,7 +177,7 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. (if window-system (defvar sd/fixed-font-family (cond ((x-list-fonts "Hasklig") "Hasklig") - ((x-list-fonts "Source Code Pro") "Source Code Pro:weight") + ((x-list-fonts "Source Code Pro") "Source Code Pro:weight") ;; weigth=light ((x-list-fonts "Anonymous Pro") "Anonymous Pro") ((x-list-fonts "M+ 1mn") "M+ 1mn")) "The fixed width font based on what is installed, `nil' if not defined.")) @@ -182,11 +185,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 130) - (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 120) + (set-face-font 'default sd/fixed-font-family))) #+END_SRC *** Chinese fonts @@ -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) + ;; 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 "Source Sans Code" :height 160)) + (buffer-face-mode)) + + ;; (add-hook 'org-mode-hook 'sd/org-buffer-font) #+END_SRC ** Color Theme @@ -718,29 +731,32 @@ 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) + (setq org-hide-emphasis-markers t)) (el-get-bundle hasu/emacs-ob-racket :features ob-racket) - (org-babel-do-load-languages - 'org-babel-load-languages - '((python . t) - (C . t) - (perl . t) - (calc . t) - (latex . t) - (java . t) - (ruby . t) - (lua . t) - (lisp . t) - (scheme . t) - (racket . t) - (sh . t) - (sqlite . t) - (js . t) - (gnuplot . t) - (ditaa . t))) + (org-babel-do-load-languages 'org-babel-load-languages + '((python . t) + (C . t) + (perl . t) + (calc . t) + (latex . t) + (java . t) + (ruby . t) + (lua . t) + (lisp . t) + (scheme . t) + (racket . t) + (sh . t) + (sqlite . t) + (js . t) + (gnuplot . t) + (ditaa . t))) ;; use current window for org source buffer editting (setq org-src-window-setup 'current-window ) @@ -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 @@ -3342,3 +3340,81 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828 ** SICP ** music searcher search music on some music web site +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + ;; (create-fontset-from-fontset-spec + ;; "-*-Source Code Pro-*-*-*-*-12-*-*-*-*-*-fontset-Source Code Pro, + ;; ascii:-*-Source Code Pro-normal-normal-normal-*-23-*-*-*-m-0-iso10646-1, + ;; latin-iso8859-1:-*-Source Code Pro-normal-normal-normal-*-17-*-*-*-m-0-iso10646-1, + ;; latin-iso8859-15:-*-Source Code Pro-normal-normal-normal-*-17-*-*-*-m-0-iso10646-1, + ;; chinese-gb2312:-*-STHeiti-*-*-*-*-14-*-*-*-c-*-*-*, + ;; han:-*-STHeiti-*-*-*-*-14-*-*-*-c-*-*-*") + + + ;; (create-fontset-from-fontset-spec + ;; "-*-Courier New-normal-r-*-*-14-*-*-*-c-*-fontset-myfixwidth, + ;; ascii:-*-Courier New-normal-normal-normal-*-17-*-*-*-m-0-iso10646-1, + ;; kana:-*-STFangsong-normal-r-*-*-16-*-*-*-c-*-*-*, + ;; han:-*-STFangsong-normal-r-*-*-16-*-*-*-c-*-*-*, + ;; symbol:-*-STFangsong-normal-r-*-*-16-*-*-*-c-*-*-*, + ;; cjk-misc:-*-STFangsong-normal-r-*-*-16-*-*-*-c-*-*-*, + ;; bopomofo:-*-STFangsong-normal-r-*-*-16-*-*-*-c-*-*-*" t) + ;; (create-fontset-from-fontset-spec + ;; "-*-Courier New-normal-r-*-*-14-*-*-*-c-*-fontset-myfixwidth, + ;; ascii:-*-Courier New-normal-normal-normal-*-17-*-*-*-m-0-iso10646-1") + + ;; (create-fontset-from-fontset-spec + ;; "-*-Source Code Pro-normal-normal-normal-*-12-*-*-*-*-*-fontset-osaka12") + ;; (create-fontset-from-fontset-spec + ;; "-*-Source Code Pro-normal-normal-normal-*-12-*-*-*-*-*-fontset-osaka13") + + ;; (create-fontset-from-fontset-spec + ;; "-*-consolas-*-*-*-*-12-*-*-*-*-*-fontset-consolas, + ;; ascii:-*-consolas-*-*-*-*-12-*-*-*-*-*-iso8859-1, + ;; latin-iso8859-1:-*-consolas-*-*-*-*-12-*-*-*-*-*-iso8859-1, + ;; latin-iso8859-15:-*-consolas-*-*-*-*-12-*-*-*-*-*-iso8859-15") + + ;; (setq default-frame-alist '(;; (width . 100) + + ;; ;; (height . 44) + + ;; ;; (top . 50) + ;; ;pixels + ;; ;; (left . 50) + ;; ;pixels + ;; (font . "fontset-my-private") + ;; )) + ;; (with-eval-after-load "org" + ;; (set-face-attribute 'org-code nil :family "fontset-myfixwidth") + ;; (set-face-attribute 'org-block nil :family "fontset-myfixwidth") + ;; (set-face-attribute 'org-table nil :family "fontset-myfixwidth") + ;; (set-face-attribute 'org-block-background nil :family "fontset-myfixwidth")) + ;; (setq default-frame-alist + ;; (append + ;; '((font . "fontset-osaka13")) default-frame-alist)) + + + ;; (set-fontset-font + ;; "fontset-default" nil + ;; "-*-stheiti-*-*-*-*-14-*-*-*-*-*-gb2312.1980-*" nil 'prepend) + ;; (set-fontset-font + ;; "fontset-osaka12" 'kana + ;; "-*-stheiti-*-*-*-*-14-*-*-*-*-*-gbk-0" nil 'prepend) + ;; (set-fontset-font + ;; "fontset-osaka12" 'han + ;; "-*-stheiti-*-*-*-*-14-*-*-*-*-*-gbk-0" nil 'prepend) + ;; (set-fontset-font + ;; "fontset-osaka12" 'cjk-misc + ;; "-*-stheiti-*-*-*-*-14-*-*-*-*-*-gbk-0" nil 'prepend) + + (set-face-attribute 'variable-pitch nil :font "Calibri" :height 160) + (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height 120) + + (add-hook 'text-mode-hook 'variable-pitch-mode) + + (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)) +#+END_SRC +