X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Fconfig.org;h=dc0f9c6a15fd81c2cfba4fe7575bb3b4741f828d;hb=42ae2e166081266938727d30c27679266949ea80;hp=17d7b026cf9c2929999dc01d4eb89698c1ee37b1;hpb=b71d4ea6df03a59907e9a0ca42c6075890809822;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 17d7b02..dc0f9c6 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -237,24 +237,6 @@ Fix the font alignment issue when both Chinese and English hybird in org-mode ta (interactive) (emacs-step-font-size -1)) #+END_SRC -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - ;; Setup font size based on emacs-font-size-pair - ;; (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 @@ -1141,7 +1123,15 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em *** 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) + ;; check if the fonts are available + (unless (find-font (font-spec :name "Ubuntu Mono")) + (warn "Font not found Ubuntu Mono")) + (unless (find-font (font-spec :name "Source Code Pro")) + (warn "Font not found Source Code Pro")) + (unless (find-font (font-spec :name "Source Sans Pro")) + (warn "Font not found Source Sans Pro")) + + (set-face-attribute 'variable-pitch nil :font "Source Sans Pro" :height 160) (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height (face-attribute 'default :height)) (add-hook 'text-mode-hook 'variable-pitch-mode) @@ -1150,7 +1140,7 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em (with-eval-after-load "org" (mapc (lambda (face) (set-face-attribute face nil :inherit 'fixed-pitch)) - (list 'org-code 'org-block 'org-block-background)) + (list 'org-code 'org-block 'org-block-background 'org-block-begin-line 'org-block-end-line)) (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 140) ;; org-special-keyword inherited from font-lock-keywork originally; as org is changed to variable-pitch, it cause ;; the font in special-keywords are not monospace @@ -1247,14 +1237,9 @@ set default eshell history folder ** Eshell erase buffer #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (defun sd/eshell-clear-buffer () - "Clear eshell buffer" - (interactive) - (let ((inhibit-read-only t)) - (erase-buffer) - (eshell-send-input))) + (require 'utilities) - (add-hook 'eshell-mode-hook (lambda () + (add-hook 'eshell-mode-hook (lambda () (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer))) #+END_SRC @@ -1577,26 +1562,26 @@ When see function by =C-h f=, and visit the source code, I would like the buffer ** pdf-tools #+BEGIN_SRC sh - brew install poppler + #brew install poppler #+END_SRC #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package pdf-tools - :ensure t - :init - ;; run to complete the installation - (pdf-tools-install) - :config - (add-to-list 'auto-mode-alist '("\.pdf$" . pdf-view-mode)) - (add-hook 'pdf-outline-buffer-mode-hook #'sd/pdf-outline-map)) + ;(use-package pdf-tools + ; :ensure t + ; :init + ; ;; run to complete the installation + ; (pdf-tools-install) + ; :config + ; (add-to-list 'auto-mode-alist '("\.pdf$" . pdf-view-mode)) + ; (add-hook 'pdf-outline-buffer-mode-hook #'sd/pdf-outline-map)) - (defun sd/pdf-outline-map () - "My keybindings in pdf-outline-map" - (interactive) - (define-key pdf-outline-buffer-mode-map (kbd "C-o") nil) - (define-key pdf-outline-buffer-mode-map (kbd "i") 'outline-toggle-children) - (define-key pdf-outline-buffer-mode-map (kbd "j") 'next-line) - (define-key pdf-outline-buffer-mode-map (kbd "k") 'previous-line)) + ;(defun sd/pdf-outline-map () + ; "My keybindings in pdf-outline-map" + ; (interactive) + ; (define-key pdf-outline-buffer-mode-map (kbd "C-o") nil) + ; (define-key pdf-outline-buffer-mode-map (kbd "i") 'outline-toggle-children) + ; (define-key pdf-outline-buffer-mode-map (kbd "j") 'next-line) + ; (define-key pdf-outline-buffer-mode-map (kbd "k") 'previous-line)) #+END_SRC ** help-mode @@ -2965,20 +2950,7 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del #+BEGIN_SRC emacs-lisp :tangle yes :results silent (winner-mode 1) - (defun sd/delete-current-window () - (interactive) - (if (> (length (window-list)) 1) - (delete-window) - (message "Only one Windows now!"))) - - (defun sd/toggle-max-windows () - "Set maximize current if there are multiple windows, if only - one window, window undo" - (interactive) - (if (equal (length (window-list)) 1) - (winner-undo) - (delete-other-windows))) - + (require 'utilities) (defhydra sd/hydra-window (:color red :columns nil) "C-o" ;; windows switch @@ -3488,12 +3460,7 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba8281255a594/setup/.emacs.d/loader-init/_90-kill-region-or-backward-kill-word.el][kill-region-or-backward-kill-word]] #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (defun sd/kill-region-or-backward-kill-word () - (interactive) - (if (region-active-p) - (kill-region (point) (mark)) - (backward-kill-word 1))) - + (require 'utilities) (global-set-key (kbd "C-w") 'sd/kill-region-or-backward-kill-word) #+END_SRC