X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=387b4802acce50371c29f6763338ba997df89454;hb=231ca352bda49b1cf998fd376a9b803205f4250f;hp=16841b9baddb068f38f1d52f53184cb150ac0fd0;hpb=b35cbb9eb7cb16b3ebdc0d47062b9dec5376d6ab;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 16841b9..387b480 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -111,31 +111,29 @@ Make a temp directory for all cache/history files * Package Management Tools ** Use-package - Using [[https://github.com/jwiegley/use-package][use-package]] to manage emacs packages - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (unless (package-installed-p 'use-package) (package-refresh-contents) (package-install 'use-package)) (require 'use-package) - #+END_SRC ** El-get - [[https://github.com/dimitri/el-get][El-get]] is package management tool, whicl allows to install external elisp package from any git repository not in mepla. Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package el-get :ensure t :init (add-to-list 'load-path "~/.emacs.d/el-get")) +#+END_SRC +** paradox +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package paradox + :ensure t) #+END_SRC * Color and Fonts Settings @@ -439,7 +437,7 @@ Revised powerline-center-theme :group 'powerline) ;; Don't show buffer modified for scratch and eshell mode - (defun sd/buffer-show-modified () + (defun sd/buffer-is-eshel-or-scratch () "Dot not show modified indicator for buffers" (interactive) (unless (or (string-match "*scratch*" (buffer-name)) @@ -456,7 +454,7 @@ Revised powerline-center-theme (mode-line-buffer-id (if active 'sd/mode-line-buffer-id 'mode-line-buffer-id-inactive)) (mode-line (if active 'mode-line 'mode-line-inactive)) (my-face1 (if active 'sd/powerline-active1 'powerline-inactive1)) - (my-face-buffer-modified (if (and (sd/buffer-show-modified) (buffer-modified-p)) + (my-face-buffer-modified (if (and (sd/buffer-is-eshel-or-scratch) (buffer-modified-p) (not buffer-read-only)) 'sd/buffer-modified-active1 (if buffer-read-only 'sd/buffer-view-active1 my-face1))) @@ -906,15 +904,11 @@ Setting agenda files and the agenda view #+END_SRC ** Export PDF - -Install MacTex-basic and some tex packages - -#+BEGIN_SRC bash - +Install MacTex-basic [[http://www.tug.org/mactex/morepackages.html][MacTex-basic]] and some tex packages +#+BEGIN_SRC sh sudo tlmgr update --self sudo tlmgr install titlesec framed threeparttable wrapfig multirow enumitem bbding titling tabu mdframed tcolorbox textpos import varwidth needspace tocloft ntheorem environ trimspaces collection-fontsrecommended capt-of - #+END_SRC #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -1016,6 +1010,8 @@ and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github :init ;; don't ask me to confirm the unsaved change (setq magit-save-repository-buffers nil) + ;; default is 50 + (setq git-commit-summary-max-length 80) :commands magit-status magit-blame :config (dolist (map (list magit-status-mode-map @@ -1033,20 +1029,20 @@ and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github #+END_SRC * Eshell -*** Eshell alias +** Eshell alias #+BEGIN_SRC emacs-lisp :tangle yes :results silent (defalias 'e 'find-file) (defalias 'ff 'find-file) (defalias 'ee 'find-files) #+END_SRC -*** eshell temp directory +** eshell temp directory set default eshell history folder #+BEGIN_SRC emacs-lisp :tangle yes :results silent (setq eshell-directory-name (concat sd-temp-directory "eshell")) #+END_SRC -*** Eshell erase buffer +** Eshell erase buffer #+BEGIN_SRC emacs-lisp :tangle yes :results silent (defun sd/eshell-clear-buffer () "Clear eshell buffer" @@ -1059,7 +1055,7 @@ set default eshell history folder (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer))) #+END_SRC -*** Toggle Eshell +** Toggle Eshell Toggle an eshell in split window below, refer [[http://www.howardism.org/Technical/Emacs/eshell-fun.html][eshell-here]] #+BEGIN_SRC emacs-lisp :tangle yes :results silent (defun sd/window-has-eshell () @@ -1100,7 +1096,15 @@ Toggle an eshell in split window below, refer [[http://www.howardism.org/Technic (global-set-key (kbd "s-e") 'sd/toggle-eshell-here) #+END_SRC -*** TODO smart display +** exec-path-from-shell +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package exec-path-from-shell + :ensure t + :config + (exec-path-from-shell-initialize)) +#+END_SRC + +** TODO smart display * Misc Settings ** [[https://github.com/abo-abo/hydra][Hydra]] @@ -1262,16 +1266,6 @@ Type =o= to go to the link #+END_SRC -** Emux - -[[https://github.com/re5et/emux][emux]] is - -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - - (el-get-bundle re5et/emux) - -#+END_SRC - ** Smart Parens #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -1314,25 +1308,6 @@ Type =o= to go to the link #+END_SRC -** Tabbar - -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - - ;; (use-package tabbar-ruler - ;; :ensure t - ;; :init - ;; (setq tabbar-ruler-global-tabbar t) - ;; (setq tabbar-ruler-global-ruler t) - ;; (setq tabbar-ruler-popu-menu t) - ;; (setq tabbar-ruler-popu-toolbar t) - ;; (setq tabbar-use-images t) - ;; :config - ;; (tabbar-ruler-group-by-projectile-project) - ;; (global-set-key (kbd "s-1") 'tabbar-forward-group) - ;; (global-set-key (kbd "s-2") 'tabbar-ruler-forward)) - -#+END_SRC - ** View only for some directory When see function by =C-h f=, and visit the source code, I would like the buffer is read only. See [[http://emacs.stackexchange.com/questions/3676/how-to-enter-view-only-mode-when-browsing-emacs-source-code-from-help/3681#3681][here]] #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -1341,7 +1316,10 @@ When see function by =C-h f=, and visit the source code, I would like the buffer '((nil . ((buffer-read-only . t) (show-trailing-whitespace . nil) (tab-width . 8) - (eval . (whitespace-mode -1)))))) + (eval . (whitespace-mode -1)) + (eval . (when buffer-file-name + (setq-local view-no-disable-on-exit t) + (view-mode-enter))))))) ;; (dir-locals-set-directory-class (expand-file-name "/usr/local/share/emacs") 'emacs) (dir-locals-set-directory-class "/usr/local/Cellar/emacs" 'emacs) @@ -1354,6 +1332,10 @@ When see function by =C-h f=, and visit the source code, I would like the buffer #+BEGIN_SRC emacs-lisp :tangle yes :results silent (el-get-bundle info+ :url "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/master/info+.el" + ;; (require 'info+) + ) + + (with-eval-after-load 'info (require 'info+)) #+END_SRC @@ -1384,8 +1366,6 @@ When see function by =C-h f=, and visit the source code, I would like the buffer ** TODO Man mode Color for Man-mode -** TODO swiper to occur - ** TODO UTF8 #+BEGIN_SRC emacs-lisp :tangle yes :results silent ;; (set-language-environment "UTF-8") @@ -1414,34 +1394,178 @@ Color for Man-mode (define-key org-tree-slide-mode-map [escape] 'org-tree-slide-move-previous-tree)) #+END_SRC -* dired +** pdf-tools +#+BEGIN_SRC sh + 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)) + + (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 + +* Dired +** Dired bindings =C-o= is defined as a global key for window operation, here unset it in dired mode #+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defun sd/dired-key-map () + "My keybindings for dired" + (interactive) + ;; these two prefix are used globally + (define-key dired-mode-map (kbd "C-o") nil) + (define-key dired-mode-map (kbd "M-s") nil) + ;; toggle hidden files + (define-key dired-mode-map (kbd "H") 'dired-omit-mode) + ;; scroll + (define-key dired-mode-map (kbd "SPC") 'scroll-up-command) + (define-key dired-mode-map (kbd "DEL") 'scroll-down-command) + (define-key dired-mode-map (kbd "j") 'diredp-next-line) + (define-key dired-mode-map (kbd "k") 'diredp-previous-line) + (define-key dired-mode-map (kbd "g") 'dired-goto-file) + ;; (define-key dired-mode-map (kbd "S-SPC") 'scroll-down-command) + ;; jump to fil/dirs + (define-key dired-mode-map (kbd "f") 'dired-isearch-filenames) + ;; subdir + ;; i dired-maybe-insert-subdir + ;; o dired-find-file-other-window (switch to other window) + ;; O dired-display-file + (define-key dired-mode-map (kbd "G") 'ido-dired) + (define-key dired-mode-map (kbd "c") 'sd/dired-new-file) + (define-key dired-mode-map (kbd "h") 'dired-summary) + (define-key dired-mode-map (kbd "r") 'revert-buffer) + (define-key dired-mode-map (kbd "l") 'dired-display-file) + (define-key dired-mode-map [C-backspace] 'sd/dired-high-level-dir) + (define-key dired-mode-map (kbd "?") 'describe-mode) + (define-key dired-mode-map (kbd "z") #'sd/dired-get-size) + (define-key dired-mode-map (kbd "C-d") 'dired-kill-subdir) + (define-key dired-mode-map (kbd "M-d") 'dired-kill-subdir) + (define-key dired-mode-map (kbd "J") 'diredp-next-subdir) + (define-key dired-mode-map (kbd "TAB") 'diredp-next-subdir) + (define-key dired-mode-map (kbd "K") 'diredp-prev-subdir) + (define-key dired-mode-map (kbd "O") 'dired-display-file) + (define-key dired-mode-map (kbd "I") 'other-window)) + (use-package dired :config (require 'dired-x) + ;; also load dired+ + (use-package dired+ + :ensure t + :init (setq diredp-hide-details-initially-flag nil)) + (setq dired-omit-mode t) (setq dired-omit-files (concat dired-omit-files "\\|^\\..+$")) (add-hook 'dired-mode-hook (lambda () - (define-key dired-mode-map (kbd "C-o") nil) - (define-key dired-mode-map (kbd "H") 'dired-omit-mode) - (define-key dired-mode-map (kbd "DEL") (lambda () (interactive) (find-alternate-file ".."))) + (sd/dired-key-map) (dired-omit-mode)))) + + (defadvice dired-summary (around sd/dired-summary activate) + "Revisied dired summary." + (interactive) + (dired-why) + (message + "Δ: d-delete, u-ndelete, x-punge, f-ind, o-ther window, R-ename, C-opy, c-create, +new dir, r-evert, /-filter, h-summary, ?-help")) + + (defun sd/dired-high-level-dir () + "Go to higher level directory" + (interactive) + (find-alternate-file "..")) #+END_SRC -Dired+ #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package dired+ + (defun sd/dired-new-file () + "Create a new file in dired mode" + (interactive) + (call-interactively 'find-file)) + + ;; copied from abo-abo's config + (defun sd/dired-get-size () + (interactive) + (let ((files (dired-get-marked-files))) + (with-temp-buffer + (apply 'call-process "/usr/bin/du" nil t nil "-sch" files) + (message + "Size of all marked files: %s" + (progn + (re-search-backward "\\(^[ 0-9.,]+[A-Za-z]+\\).*total$") + (match-string 1)))))) +#+END_SRC + +** disable ido when dired new file +When create a new directory, I want to disalbe =ido= completion. see [[http://stackoverflow.com/questions/7479565/emacs-ido-mode-and-creating-new-files-in-directories-it-keeps-changing-the-dire][here]]. Thhis code snippets copied +from [[https://emacs.stackexchange.com/questions/13713/how-to-disable-ido-in-dired-create-directory/13795#13795?newreg%3Ddb17c20f7af3490fb11cf15f1d888e9e][How to disable IDO in ‘dired-create-directory’]] +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defun mk-anti-ido-advice (func &rest args) + "Temporarily disable IDO and call function FUNC with arguments ARGS." + (interactive) + (let ((read-file-name-function #'read-file-name-default)) + (if (called-interactively-p 'any) + (call-interactively func) + (apply func args)))) + + (defun mk-disable-ido (command) + "Disable IDO when command COMMAND is called." + (advice-add command :around #'mk-anti-ido-advice)) +#+END_SRC + +Disalble =ido= when new a directory or file in =dired= mode +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + ;; call the function which you want to disable ido + (mk-disable-ido 'dired-create-directory) + (mk-disable-ido 'sd/dired-new-file) +#+END_SRC + +** Dired open with +=!= =dired-do-shell-command= +=&= =dired-do-async-shell-command= +here on Mac, just use "open" commands to pen =.pdf=, =.html= and image files +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (setq dired-guess-shell-alist-user + '(("\\.pdf\\'" "open" "okular") + ("\\.\\(?:djvu\\|eps\\)\\'" "evince") + ("\\.\\(?:jpg\\|jpeg\\|png\\|gif\\|xpm\\)\\'" "open") + ("\\.\\(?:xcf\\)\\'" "gimp") + ("\\.csv\\'" "libreoffice") + ("\\.tex\\'" "pdflatex" "latex") + ("\\.\\(?:mp4\\|mkv\\|avi\\|flv\\|ogv\\)\\(?:\\.part\\)?\\'" "mplayer") + ("\\.\\(?:mp3\\|flac\\)\\'" "rhythmbox") + ("\\.html?\\'" "open") + ("\\.dmg\\'" "open") + ("\\.cue?\\'" "audacious"))) +#+END_SRC + +** dired-hacks +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package dired-hacks-utils :ensure t - :init - (setq diredp-hide-details-initially-flag nil) - :config - (define-key dired-mode-map (kbd "j") 'diredp-next-line) - (define-key dired-mode-map (kbd "k") 'diredp-previous-line) - (define-key dired-mode-map (kbd "g") 'dired-goto-file)) + :defer t) +#+END_SRC + +** dired-narrow +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + ;;narrow dired to match filter + (use-package dired-narrow + :ensure t + :commands (dired-narrow) + :bind (:map dired-mode-map + ("/" . dired-narrow))) #+END_SRC -* ibuffer +* Ibuffer #+BEGIN_SRC emacs-lisp :tangle yes :results silent (global-set-key (kbd "s-b") 'ibuffer) @@ -1450,7 +1574,14 @@ Dired+ (define-key ibuffer-mode-map (kbd "j") 'ibuffer-forward-line) (define-key ibuffer-mode-map (kbd "k") 'ibuffer-backward-line) (define-key ibuffer-mode-map (kbd "r") 'ibuffer-update) - (define-key ibuffer-mode-map (kbd "g") 'ibuffer-jump-to-buffer)) + (define-key ibuffer-mode-map (kbd "g") 'ibuffer-jump-to-buffer) + (define-key ibuffer-mode-map (kbd "h") 'sd/ibuffer-summary)) + + (defun sd/ibuffer-summary () + "Show summary of keybindings in ibuffer mode" + (interactive) + (message + "Β: m|u - (un)mark, /-filter, //-remove filter, t, RET, g, k, S, D, Q; q to quit; h for help")) #+END_SRC * Completion @@ -1986,8 +2117,10 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g= :ensure t :init (setq projectile-enable-caching t) + (setq projectile-switch-project-action 'projectile-dired) (setq projectile-cache-file (concat sd-temp-directory "projectile.cache")) :config + (add-to-list 'projectile-globally-ignored-files "GTAGS") (projectile-global-mode t)) (use-package persp-projectile @@ -2020,6 +2153,7 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g= (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) @@ -2127,6 +2261,11 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del ;; buffer / windows switch ("o" sd/toggle-max-windows "one" :exit t) ("C-k" sd/delete-current-window "del" :exit t) + ("D" (lambda () + (interactive) + (kill-buffer) + (sd/delete-current-window)) + "kill" :exit t) ("'" other-window "other" :exit t) ;; ("a" ace-window "ace") ("s" ace-swap-window "swap") @@ -2137,12 +2276,14 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del ;; ibuffer, dired, eshell, bookmarks ;; ("d" ace-delete-window "ace-one" :exit t) - ("C-o" ido-switch-buffer "buf" :exit t) - ("d" dired-jump "dired" :exit t) - ("b" ibuffer "ibuffer" :exit t) - ("e" eshell "eshell" :exit t) - ("m" bookmark-jump-other-window "open bmk" :exit t) - ("M" bookmark-set "set bmk" :exit t) + ("C-o" ido-switch-buffer nil :exit t) + ("d" sd/project-or-dired-jump nil :exit t) + ("b" ibuffer nil :exit t) + ("e" eshell nil :exit t) + ("m" bookmark-jump-other-window nil :exit t) + ("M" bookmark-set nil :exit t) + ("g" magit-status nil :exit t) + ("p" paradox-list-packages nil :exit t) ;; quit ("q" nil "cancel") @@ -2152,7 +2293,6 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del ;; ("C-k" nil :exit t) ("C-l" nil nil :exit t) ("C-;" nil nil :exit t) - ("p" nil nil :exit t) ("n" nil nil :exit t) ("[" nil nil :exit t) ("]" nil nil :exit t) @@ -2160,6 +2300,14 @@ Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del (global-unset-key (kbd "C-o")) (global-set-key (kbd "C-o") 'sd/hydra-window/body) + + (defun sd/project-or-dired-jump () + "If under project, jump to the root directory, otherwise + jump to dired of current file" + (interactive) + (if (projectile-project-p) + (projectile-dired) + (dired-jump))) #+END_SRC ** Motion @@ -2219,7 +2367,11 @@ toggle the mark ring. the best way is add a new action and mapping to =helm-sour since there is no map such as =helm-mark-ring=map=, so I cannot binding a key to the quit action. #+BEGIN_SRC emacs-lisp :tangle yes :results silent (setq mark-ring-max 50) - (global-set-key (kbd "M-`") #'helm-mark-ring) + + (use-package helm + :ensure t + :init + (global-set-key (kbd "M-`") #'helm-mark-ring)) (define-key minibuffer-local-map (kbd "M-`") 'keyboard-escape-quit) #+END_SRC @@ -2278,10 +2430,8 @@ Search, replace and hightlight will in later paragraph *** =Imenu= goto tag #+BEGIN_SRC emacs-lisp :tangle yes :results silent - ;; (global-set-key (kbd "M-i") #'counsel-imenu) - (global-set-key (kbd "M-i") #'imenu) - - ;; (global-set-key (kbd "M-l") 'goto-line) + (global-set-key (kbd "M-i") #'counsel-imenu) + ;; (global-set-key (kbd "M-i") #'imenu) #+END_SRC *** Go-to line @@ -2301,7 +2451,11 @@ Search, replace and hightlight will in later paragraph =helm-show-kill-ring= #+BEGIN_SRC emacs-lisp :tangle yes :results silent (setq kill-ring-max 100) ; default is 60p - (global-set-key (kbd "M-y") #'helm-show-kill-ring) + + (use-package helm + :ensure t + :init + (global-set-key (kbd "M-y") #'helm-show-kill-ring)) #+END_SRC *** undo-tree @@ -2517,17 +2671,18 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d (back-to-indentation) (set-mark (line-end-position))) - (defhydra sd/expand-selected (:color pink :columns nil - :post (deactivate-mark)) + (defhydra sd/expand-selected (:color red :columns nil + :post (deactivate-mark) + ) "Selected" ;; select ;; ("e" er/expand-region "+") - ("SPC" er/expand-region "+") + ("SPC" er/expand-region "+") ;; ("c" er/contract-region "-") - ("S-SPC" er/contract-region "-") - ("r" (lambda () - (interactive) - (er/contract-region 0)) + ("S-SPC" er/contract-region "-") + ("r" (lambda () + (interactive) + (er/contract-region 0)) "reset") ("i'" er/mark-inside-quotes "in") @@ -2540,21 +2695,15 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d ("o{" er/mark-inside-pairs nil) ("o(" er/mark-inside-pairs nil) - ("p" er/mark-paragraph "paragraph") + ("p" er/mark-paragraph "paragraph") - ("l" sd/mark-line "line") - ("u" er/mark-url "url") - ("f" er/mark-defun "fun") - ("n" er/mark-next-accessor "next") + ("l" sd/mark-line "line") + ("u" er/mark-url "url") + ("f" er/mark-defun "fun") + ("n" er/mark-next-accessor "next") ("x" exchange-point-and-mark "exchange") - ;; Move - ;; ("h" backward-char nil) - ;; ("j" next-line nil) - ;; ("k" previous-line nil) - ;; ("l" foreward-char nil) - ;; Search ;; higlight @@ -2563,12 +2712,13 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d ("y" kill-ring-save "yank" :exit t) ("M-SPC" nil "quit" :exit t) - ("C-SPC" nil "quit" :exit t) - ("q" nil "quit" :exit t)) + ;; ("C-SPC" "quit" :exit t) + ("q" deactivate-mark "quit" :exit t)) - (global-set-key (kbd "C-SPC") (lambda () + (global-set-key (kbd "M-SPC") (lambda () (interactive) (set-mark-command nil) + ;; (er/expand-region 1) (er/mark-word) (sd/expand-selected/body))) #+END_SRC