X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=bd6cf0106bac074838d1186c33240d97b524ee55;hb=268e91fb850c7326a27a5a4cf15d2e42f656b0f5;hp=a7152e1f28a1fb296de8dbdcc797734ffa2d703a;hpb=9366b055650a7a033d67a8f155be4e35143a004e;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index a7152e1..bd6cf01 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -38,7 +38,7 @@ Set system PATH and emacs exec path (menu-bar-mode 1) (menu-bar-mode 0)) - ;; (setq debug-on-error t) + (setq debug-on-error t) (setq inhibit-startup-message t) (defalias 'yes-or-no-p 'y-or-n-p) @@ -583,12 +583,14 @@ Fix the issue in mode line when showing triangle set height in mode line #+BEGIN_SRC emacs-lisp :tangle yes :results silent (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)) + (if window-system + (progn + (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 @@ -753,7 +755,8 @@ Always indents header, and hide header leading starts so that no need type =#+ST (sqlite . t) (js . t) (gnuplot . t) - (ditaa . t))) + (ditaa . t) + (plantuml . t))) ;; use current window for org source buffer editting (setq org-src-window-setup 'current-window ) @@ -773,6 +776,24 @@ Always indents header, and hide header leading starts so that no need type =#+ST :ensure t) #+END_SRC +*** plantUML +[[http://eschulte.github.io/babel-dev/DONE-integrate-plantuml-support.html][DONE-integrate-plantuml-support]] +#+BEGIN_SRC sh + ## support plantuml + brew install plantuml +#+END_SRC + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package plantuml-mode + :ensure t) + + (setq org-plantuml-jar-path + (expand-file-name "/usr/local/Cellar/plantuml/8041/plantuml.8041.jar")) + + (set-variable 'plantuml-jar-path + (expand-file-name "/usr/local/Cellar/plantuml/8041/plantuml.8041.jar")) +#+END_SRC + ** Org-bullets use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8 charactes #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -786,7 +807,7 @@ use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8 (setq org-bullets-bullet-list '("⦿" "✪" "◉" "○" "►" "◆")) ;; increase font size when enter org-src-mode - (add-hook 'org-src-mode-hook (lambda () (text-scale-increase 2))) + ;; (add-hook 'org-src-mode-hook (lambda () (text-scale-increase 2))) #+END_SRC ** Worf Mode @@ -1080,6 +1101,11 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em '("C" "#+BEGIN_SRC c :tangle ?\n\n#+END_SRC")) (add-to-list 'org-structure-template-alist '("m" "\\begin{equation}\n?\n\\end{equation}")) + + (add-to-list 'org-structure-template-alist + '("b" "#+STARTUP: showall + ,#+STARTUP: inlineimages + ,#+OPTIONS: toc:nil\n")) #+END_SRC ** Org theme @@ -1146,11 +1172,10 @@ Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html] :sitemap-filename "sitemap.org" ;... call it sitemap.org (it's the default )... :sitemap-title "Sitemap" - :table-of-contents nil - :html-postamble nil ;dont export creator auto validation info in html postamble div + :html-table-of-contents nil + :html-postamble nil ;dont export creator auto validation info in html postamble div :html-link-home "/" - :html-head "" - ;; :html-head-extra ,my-blog-extra-head + :html-head "" :html-head-include-default-style nil :html-head-include-scripts nil) ("org-static" @@ -1158,7 +1183,8 @@ Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html] :base-extension "css\\|js\\|png\\|gif\\|pdf\\|mp3\\|ogg\\|swf" :publishing-directory "~/Private/publish_html" :recursive t - :publishing-function org-publish-attachment) + :publishing-function org-publish-attachment + :table-of-contents nil) ("org" :components ("org-notes" "org-static")))) #+END_SRC @@ -1643,10 +1669,13 @@ as a http download client tool (set-face-attribute 'elscreen-tab-current-screen-face nil :foreground "black" :background "yellow") (set-face-attribute 'elscreen-tab-other-screen-face nil :foreground "black" :background "disabledControlTextColor" :underline nil) ;; (global-unset-key (kbd)); M-TAB switch screen - (global-set-key (kbd "s-`") (lambda () (interactive) (elscreen-goto 0))) + (global-set-key (kbd "s-`") '(lambda () (interactive) (elscreen-goto 0))) (dotimes (i 8) (global-set-key (kbd (concat "s-" (number-to-string (+ i 1)))) - `(lambda () (interactive) (elscreen-goto ,(+ i 1)))))) + `(lambda () (interactive) (elscreen-goto ,(+ i 1))))) + (global-set-key (kbd "s-t") 'elscreen-create) + (global-set-key (kbd "s-n") 'elscreen-next) + (global-set-key (kbd "s-p") 'elscreen-previous)) #+END_SRC * Dired @@ -2796,8 +2825,9 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g= :config (persp-mode) :bind - (:map projectile-mode-map - ("s-t" . projectile-persp-switch-project))) + ;; (:map projectile-mode-map + ;; ("s-t" . projectile-persp-switch-project)) + ) ;; change default-directory of scratch buffer to projectile-project-root (defun sd/project-switch-action () @@ -2824,71 +2854,16 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g= (global-set-key (kbd "") 'toggle-frame-fullscreen) (global-set-key (kbd "s-f") 'projectile-find-file) - (global-set-key (kbd "s-`") 'mode-line-other-buffer) + ;; (global-set-key (kbd "s-`") 'mode-line-other-buffer) - (global-set-key (kbd "s-n") 'persp-next) - (global-set-key (kbd "s-p") 'persp-prev) - (global-set-key (kbd "s-;") 'persp-switch-last) + ;; (global-set-key (kbd "s-n") 'persp-next) + ;; (global-set-key (kbd "s-p") 'persp-prev) + ;; (global-set-key (kbd "s-;") 'persp-switch-last) (global-set-key (kbd "s-=") 'text-scale-increase) (global-set-key (kbd "s--") 'text-scale-decrease) ;; (global-set-key (kbd "s-u") 'undo-tree-visualize) - - - ;; someothers default mapping on super (command) key - ;; s-s save-buffer - ;; s-k kill-this-buffer - - - ;; s-h --> ns-do-hide-emacs - ;; s-j --> ido-switch-buffer + - ;; s-k --> kill-this-buffer - ;; s-l --> goto-line - ;; s-; --> undefined - ;; s-' --> next-multiframe-window - ;; s-ret --> toggle-frame-fullscreen + - - ;; s-y --> ns-paste-secondary - ;; s-u --> revert-buffer - ;; s-i --> undefined - but used for iterm globally - ;; s-o --> used for emacs globally - ;; s-p --> projectile-persp-switch-project + - ;; s-[ --> next-buffer + - ;; s-] --> previous-buffer + - - ;; s-0 --> undefined - ;; s-9 --> undefined - ;; s-8 --> undefined - ;; s-7 --> undefined - ;; s-6 --> undefined - ;; s-- --> center-line - ;; s-= --> undefined - - ;; s-n --> make-frame - ;; s-m --> iconify-frame - ;; s-b --> undefined - ;; s-, --> customize - ;; s-. --> undefined - ;; s-/ --> undefined - - ;; s-g --> isearch-repeat-forward - ;; s-f --> projectile-find-file + - ;; s-d --> isearch-repeat-background - ;; s-s --> save-buffer - ;; s-a --> make-whole-buffer - - ;; s-b --> undefined - ;; s-v --> yank - ;; s-c --> ns-copy-including-secondary - - ;; s-t --> ns-popup-font-panel - ;; s-r --> undefined - ;; s-e --> isearch-yanqk-kill - ;; s-w --> delete-frame - ;; s-q --> same-buffers-kill-emacs - - ;; s-` --> other-frame #+END_SRC ** Windown & Buffer - =C-o= @@ -2959,6 +2934,7 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del ("C-b" ido-switch-buffer nil :exit t) ("C-f" projectile-find-file nil :exit t) ("C-p" persp-switch :exit t) + ("C-t" projectile-persp-switch-project nil :exit t) ;; other special buffers ("d" sd/project-or-dired-jump nil :exit t)