X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=a11d9c45a6b2b9303ad996c5e2b3040e23bbf4c9;hb=4b51a07375d25bedbf0f46977791968de93c8001;hp=3f4438d5ae4a7e8f487f8e61cc8f2c28054dc121;hpb=67a12b5f03b8c5e0465cbb94038a113d3a0d6efd;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 3f4438d..a11d9c4 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -406,13 +406,37 @@ Install powerline mode [[https://github.com/milkypostman/powerline][powerline]] #+END_SRC Revised powerline-center-theme - #+BEGIN_SRC emacs-lisp :tangle yes :results silent (defun sd/powerline-simpler-vc (s) (if s (replace-regexp-in-string "Git[:-]" "" s) s)) + (defface sd/powerline-active1 '((t (:background "yellow" :foreground "black" :inherit mode-line))) + "My Powerline face 1 based on powerline-active1." + :group 'powerline) + + (defface sd/buffer-modified-active1 '((t (:background "red" :foreground "black" :inherit mode-line))) + "My Powerline face 1 based on powerline-active1." + :group 'powerline) + + (defface sd/buffer-view-active1 '((t (:background "green" :foreground "black" :inherit mode-line))) + "My Powerline face 1 based on powerline-active1." + :group 'powerline) + + (defface sd/mode-line-buffer-id + '((t (:background "yellow" :foreground "black" :inherit mode-line-buffer-id))) + "My powerline mode-line face, based on mode-line-buffer-id" + :group 'powerline) + + ;; Don't show buffer modified for scratch and eshell mode + (defun sd/buffer-show-modified () + "Dot not show modified indicator for buffers" + (interactive) + (unless (or (string-match "*scratch*" (buffer-name)) + (equal major-mode 'eshell-mode)) + t)) + (defun sd/powerline-center-theme_revised () "Setup a mode-line with major and minor modes centered." (interactive) @@ -420,8 +444,13 @@ Revised powerline-center-theme '("%e" (:eval (let* ((active (powerline-selected-window-active)) - (mode-line-buffer-id (if active 'mode-line-buffer-id 'mode-line-buffer-id-inactive)) + (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)) + 'sd/buffer-modified-active1 + (if buffer-read-only 'sd/buffer-view-active1 + my-face1))) (face1 (if active 'powerline-active1 'powerline-inactive1)) (face2 (if active 'powerline-active2 'powerline-inactive2)) (separator-left (intern (format "powerline-%s-%s" @@ -430,23 +459,24 @@ Revised powerline-center-theme (separator-right (intern (format "powerline-%s-%s" (powerline-current-separator) (cdr powerline-default-separator-dir)))) - (lhs (list (powerline-raw "%*" mode-line 'l) + (lhs (list (powerline-raw "%* " my-face-buffer-modified 'l) ;; (powerline-buffer-size mode-line 'l) (powerline-buffer-id mode-line-buffer-id 'l) - (powerline-raw " ") - (funcall separator-left mode-line face1) + (powerline-raw " " my-face1) + (funcall separator-left my-face1 face1) (powerline-narrow face1 'l) ;; (powerline-vc face1) - (sd/powerline-simpler-vc (powerline-vc face1)) - )) + (sd/powerline-simpler-vc (powerline-vc face1)))) (rhs (list (powerline-raw global-mode-string face1 'r) (powerline-raw "%4l" face1 'r) - (powerline-raw ":" face1) + (powerline-raw ":" face1) (powerline-raw "%3c" face1 'r) - (funcall separator-right face1 mode-line) - (powerline-raw " ") - (powerline-raw "%6p" mode-line 'r) - (powerline-hud face2 face1))) + (funcall separator-right face1 my-face1) + ;; (powerline-raw " " my-face1) + (powerline-raw (format-time-string " %I:%M %p ") my-face1 'r) + ;; (powerline-raw "%6p" my-face1 'r) + ;; (powerline-hud my-face1 face1 ) + )) (center (list (powerline-raw " " face1) (funcall separator-left face1 face2) (when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode) @@ -467,21 +497,19 @@ Revised powerline-center-theme #+END_SRC Fix the issue in mode line when showing triangle - #+BEGIN_SRC emacs-lisp :tangle yes :results silent (setq ns-use-srgb-colorspace nil) #+END_SRC set height in mode line - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - - (custom-set-variables - '(powerline-height 14) - '(powerline-text-scale-factor 0.8)) - ;; 100/140 + (set-variable 'powerline-height 14) + (set-variable 'powerline-text-scale-factor (/ (float 100) 140)) + ;; (custom-set-variables + ;; '(powerline-height 14) + ;; '(powerline-text-scale-factor (/ (float 100) 140))) + ;; 100/140;0.8 (set-face-attribute 'mode-line nil :height 100) - #+END_SRC * IDO & SMEX @@ -600,10 +628,10 @@ Stolen from [[https://github.com/redguardtoo/emacs.d/blob/master/lisp/init-spell ;; ;; Turn off RUN-TOGETHER option when spell check text-mode ;; (setq-local ispell-extra-args (flyspell-detect-ispell-args))) ;; (add-hook 'text-mode-hook 'text-mode-hook-setup) - (add-hook 'text-mode-hook 'flyspell-mode) + ;; (add-hook 'text-mode-hook 'flyspell-mode) ;; enable flyspell check on comments and strings in progmamming modes - (add-hook 'prog-mode-hook 'flyspell-prog-mode) + ;; (add-hook 'prog-mode-hook 'flyspell-prog-mode) ;; I don't use the default mappings (with-eval-after-load 'flyspell @@ -870,10 +898,10 @@ Occur search key bindings ;; (global-set-key "\C-s" 'swiper) ;; (global-set-key (kbd "C-c C-r") 'ivy-resume) ;; (global-set-key (kbd "") 'ivy-resume) - ;; ;; (global-set-key (kbd "M-x") 'counsel-M-x) + (global-set-key (kbd "M-x") 'counsel-M-x) ;; ;; (global-set-key (kbd "C-x C-f") 'counsel-find-file) - ;; (global-set-key (kbd " f") 'counsel-describe-function) - ;; (global-set-key (kbd " v") 'counsel-describe-variable) + (global-set-key (kbd "C-h f") 'counsel-describe-function) + (global-set-key (kbd "C-h v") 'counsel-describe-variable) ;; (global-set-key (kbd " l") 'counsel-load-library) ;; (global-set-key (kbd " i") 'counsel-info-lookup-symbol) ;; (global-set-key (kbd " u") 'counsel-unicode-char) @@ -884,6 +912,10 @@ Occur search key bindings ;; (global-set-key (kbd "C-S-o") 'counsel-rhythmbox) ;; ;; (define-key read-expression-map (kbd "C-r") 'counsel-expression-history) + (set-face-attribute + 'ivy-current-match nil + :background "Orange" + :foreground "black") #+END_SRC *** =M-s= prefix @@ -971,7 +1003,8 @@ Always indents header, and hide header leading starts so that no need type =#+ST (sh . t) (sqlite . t) (js . t) - (gnuplot . t))) + (gnuplot . t) + (ditaa . t))) ;; use current window for org source buffer editting (setq org-src-window-setup 'current-window ) @@ -1735,6 +1768,23 @@ Play Go in Emacs, gnugo xpm refert [[https://github.com/okanotor/dotemacs/blob/f #+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 + (dir-locals-set-class-variables + 'emacs + '((nil . ((buffer-read-only . t) + (show-trailing-whitespace . nil) + (tab-width . 8) + (eval . (whitespace-mode -1)))))) + + ;; (dir-locals-set-directory-class (expand-file-name "/usr/local/share/emacs") 'emacs) + (dir-locals-set-directory-class "/usr/local/Cellar/emacs" 'emacs) + ;; (dir-locals-set-directory-class "~/.emacs.d/elpa" 'emacs) + (dir-locals-set-directory-class "~/dotfiles/emacs.d/elpa" 'emacs) + (dir-locals-set-directory-class "~/dotfiles/emacs.d/el-get" 'emacs) +#+END_SRC + ** Info plus #+BEGIN_SRC emacs-lisp :tangle yes :results silent (el-get-bundle info+ @@ -1768,11 +1818,6 @@ Play Go in Emacs, gnugo xpm refert [[https://github.com/okanotor/dotemacs/blob/f ** TODO Man mode Color for Man-mode -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - ;; (add-hook 'Man-mode-hook (lambda () - ;; (interactive) - ;; (setenv "GROFF_NO_SRG"))) -#+END_SRC ** TODO swiper to occur @@ -1831,11 +1876,25 @@ Dired+ (define-key dired-mode-map (kbd "g") 'dired-goto-file)) #+END_SRC +* Completion +company mode and company-statistics +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package company + :ensure t + :diminish company-mode + :init (setq company-idle-delay 0.1) + :config + (global-company-mode)) + + (use-package company-statistics + :ensure t + :config + (company-statistics-mode)) +#+END_SRC + * Programming Language ** Emacs Lisp - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package color-identifiers-mode :ensure t :init @@ -1844,14 +1903,10 @@ Dired+ :diminish color-identifiers-mode) (global-prettify-symbols-mode t) - #+END_SRC -**** Lispy Mode - In Lisp Mode, =M-o= is defined, but I use this for global hydra window. So here disable this key bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questions/298048/how-to-handle-conflicting-keybindings][here]] - #+BEGIN_SRC emacs-lisp :tangle yes :results silent (use-package lispy :ensure t @@ -1864,6 +1919,7 @@ bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questi #+END_SRC ** Perl +*** CPerl mode [[https://www.emacswiki.org/emacs/CPerlMode][CPerl mode]] has more features than =PerlMode= for perl programming. Alias this to =CPerlMode= #+BEGIN_SRC emacs-lisp :tangle yes :results silent (defalias 'perl-mode 'cperl-mode) @@ -1886,15 +1942,39 @@ bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questi (defalias 'perldoc 'cperl-perldoc) #+END_SRC -- auto insert -- run script +*** Perl template +Refer [[https://www.emacswiki.org/emacs/AutoInsertMode][AutoInsertMode]] Wiki +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (eval-after-load 'autoinsert + '(define-auto-insert '("\\.pl\\'" . "Perl skeleton") + '( + "Empty" + "#!/usr/bin/perl -w" \n + \n + "use strict;" > \n \n + > _ + ))) +#+END_SRC + +*** Perl Keywords +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (font-lock-add-keywords 'cperl-mode + '(("\\(say\\)" . cperl-nonoverridable-face) + ("\\([0-9.]\\)*" . font-lock-constant-face) + ("\".*\\(\\\n\\).*\"" . font-lock-constant-face) + ("\n" . font-lock-constant-face) + ("\\(^#!.*\\)$" . cperl-nonoverridable-face))) + + ;; (font-lock-add-keywords 'Man-mode + ;; '(("\\(NAME\\)" . font-lock-function-name-face))) + +#+END_SRC +*** Run Perl Change the compile-command to set the default command run when call =compile= Mapping =s-r= (on Mac, it's =Command + R= to run the script. Here =current-prefix-arg= is set to call =compilation= interactively. - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (defun my-perl-hook () (progn (setq-local compilation-read-command nil) @@ -1903,23 +1983,18 @@ to call =compilation= interactively. (if buffer-file-name (shell-quote-argument buffer-file-name)))) (local-set-key (kbd "s-r") - (lambda () - (interactive) - ; (setq current-prefix-arg '(4)) ; C-u - (call-interactively 'compile))))) + (lambda () + (interactive) + ; (setq current-prefix-arg '(4)) ; C-u + (call-interactively 'compile))))) (add-hook 'cperl-mode-hook 'my-perl-hook) - - #+END_SRC ** C & C++ - #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (setq c-default-style "stroustrup" c-basic-offset 4) - #+END_SRC * Compile @@ -1990,20 +2065,6 @@ Set the environments vairables in compilation mode ))) #+END_SRC -** Perl Auto Insert -Refer [[https://www.emacswiki.org/emacs/AutoInsertMode][AutoInsertMode]] Wiki -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - (eval-after-load 'autoinsert - '(define-auto-insert '("\\.pl\\'" . "Perl skeleton") - '( - "Empty" - "#!/usr/bin/perl -w" \n - \n - "use strict;" > \n \n - > _ - ))) -#+END_SRC - ** Python template #+BEGIN_SRC emacs-lisp :tangle yes :results silent (eval-after-load 'autoinsert @@ -2086,32 +2147,6 @@ Emacs lisp auto-insert, based on the default module in =autoinsert.el=, but repl > _))) #+END_SRC -* Completion - -company mode - -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - - (use-package company - :ensure t - :diminish company-mode - :init (setq company-idle-delay 0.1) - :config - (global-company-mode)) - -#+END_SRC - -[[https://github.com/company-mode/company-statistics][company-statistics]] - -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - - (use-package company-statistics - :ensure t - :config - (company-statistics-mode)) - -#+END_SRC - * Markdown mode #+BEGIN_SRC emacs-lisp :tangle yes :results silent (use-package markdown-mode @@ -2302,6 +2337,16 @@ Use =gnuplot= on =Org-mode= file, see [[http://orgmode.org/worg/org-contrib/babe - passion - vision - mission +* Ediff +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (with-eval-after-load 'ediff + (setq ediff-split-window-function 'split-window-horizontally) + (setq ediff-window-setup-function 'ediff-setup-windows-plain) + (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display) + (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display) + (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display)) +#+END_SRC + * TODO Convert ASCII to key ** map =function-key-map= [[http://academic.evergreen.edu/projects/biophysics/technotes/program/ascii_ctrl.htm][ascii_ctrl]] new file =C-x C-f C-f= @@ -2310,9 +2355,27 @@ new file =C-x C-f C-f= #+BEGIN_SRC emacs-lisp :tangle yes :results silent (font-lock-add-keywords 'perl-mode '(("\\(|\\w+?\\(,\\w+?\\)?|\\)" 1 'py-builtins-face))) - - (font-lock-add-keywords - 'cperl-mode - '(("\\(say\\)" . font-lock-constant-face))) #+END_SRC +* TODO set fly-spell binding + +* TODO imenu bindings + +* DONE modified indicator +:LOGBOOK: +- State "DONE" from "TODO" [2016-07-18 Mon 23:35] +:END: +* DONE highlight selected ido candicate +:LOGBOOK: +- State "DONE" from "TODO" [2016-07-19 Tue 01:49] +:END: +* DONE show time in right of mode-line +:LOGBOOK: +- State "DONE" from "TODO" [2016-07-19 Tue 01:11] +:END: +* DONE ediff mode +:LOGBOOK: +- State "DONE" from "TODO" [2016-07-19 Tue 01:11] +:END: +* TODO jump last change point +* TODO emms mode-line