X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=a11d9c45a6b2b9303ad996c5e2b3040e23bbf4c9;hb=4b51a07375d25bedbf0f46977791968de93c8001;hp=3f93fce967575eb4eb09432f21860699a8838ee3;hpb=29bef26673356a18ac2906d54644e1683cd809bf;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 3f93fce..a11d9c4 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -406,7 +406,6 @@ 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 @@ -421,11 +420,23 @@ Revised powerline-center-theme "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) @@ -436,10 +447,10 @@ 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 (buffer-modified-p) + (my-face-buffer-modified (if (and (sd/buffer-show-modified) (buffer-modified-p)) 'sd/buffer-modified-active1 - (if active 'sd/powerline-active1 - 'powerline-inactive1))) + (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" @@ -448,7 +459,7 @@ Revised powerline-center-theme (separator-right (intern (format "powerline-%s-%s" (powerline-current-separator) (cdr powerline-default-separator-dir)))) - (lhs (list (powerline-raw "%*" my-face-buffer-modified '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 " " my-face1) @@ -461,9 +472,11 @@ Revised powerline-center-theme (powerline-raw ":" face1) (powerline-raw "%3c" face1 'r) (funcall separator-right face1 my-face1) - (powerline-raw " " my-face1) - (powerline-raw "%6p" my-face1 'r) - (powerline-hud my-face1 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) @@ -484,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 @@ -887,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) @@ -901,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 @@ -2322,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= @@ -2332,3 +2357,25 @@ new file =C-x C-f C-f= (font-lock-add-keywords 'perl-mode '(("\\(|\\w+?\\(,\\w+?\\)?|\\)" 1 'py-builtins-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