X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=f0a8f95d7480dbd532fe5b27e7c5d441dd469120;hb=4b5702e69a2a4b3812abcb8302df2d52275f6e07;hp=2626e492361f3ed7aefff0cc32b13408b8f11675;hpb=ace4716f4d59ff52a56a8188f047f5f3be97ff21;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 2626e49..f0a8f95 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -109,11 +109,6 @@ Make a temp directory for all cache/history files #+END_SRC * Package Management Tools -** paradox -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package paradox - :ensure t) -#+END_SRC ** Use-package Using [[https://github.com/jwiegley/use-package][use-package]] to manage emacs packages @@ -135,6 +130,12 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. (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 ** highlight current line @@ -436,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)) @@ -453,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))) @@ -903,9 +904,7 @@ Setting agenda files and the agenda view #+END_SRC ** Export PDF - Install MacTex-basic and some tex packages - #+BEGIN_SRC bash sudo tlmgr update --self @@ -1259,16 +1258,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 @@ -1381,8 +1370,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") @@ -1411,19 +1398,52 @@ 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 bash + 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 config =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) + (define-key dired-mode-map (kbd "SPC") 'scroll-up-command) + (define-key dired-mode-map (kbd "S-SPC") 'scroll-down-command) + (define-key dired-mode-map (kbd "C-o") nil) + (define-key dired-mode-map (kbd "M-s") nil) + (define-key dired-mode-map (kbd "l") 'dired-isearch-filenames) + (define-key dired-mode-map (kbd "H") 'dired-omit-mode) + (define-key dired-mode-map (kbd "DEL") (lambda () (interactive) (find-alternate-file "..")))) + (use-package dired :config (require 'dired-x) (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)))) #+END_SRC @@ -1443,9 +1463,18 @@ Color for Man-mode #+BEGIN_SRC emacs-lisp :tangle yes :results silent (use-package dired-hacks-utils :ensure t) + + + (defconst my-dired-media-files-extensions '("mp3" "mp4" "MP3" "MP4" "avi" "mpg" "flv" "ogg" "wmv" "mkv" "mov" "wma") + "Media file extensions that should launch in VLC.") + + (add-to-list 'dired-guess-shell-alist-user + (list (concat "\\." + (regexp-opt my-dired-media-files-extensions) + "\\'") "mplayer")) #+END_SRC -* ibuffer +* Ibuffer #+BEGIN_SRC emacs-lisp :tangle yes :results silent (global-set-key (kbd "s-b") 'ibuffer) @@ -2225,7 +2254,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 @@ -2284,10 +2317,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 @@ -2307,7 +2338,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 @@ -2523,17 +2558,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") @@ -2546,21 +2582,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 @@ -2569,12 +2599,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