update

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 949f4e9..f711714 100644 (file)
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -581,8 +581,6 @@ Fix the font alignment issue when both Chinese and English hybird in org-mode ta
     (set-face-attribute 'default nil :font "Source Code Pro:weight=light" :height 130)
     ;; (set-fontset-font t 'han      (font-spec :family "STkaiti"))
     ;; (set-fontset-font t 'cjk-misc (font-spec :family "STkaiti"))
-    ;; (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 120)
-    ;; (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 120)
     (dolist (charset '(han cjk-misc))
       (set-fontset-font (frame-parameter nil 'font) charset
                         ;; (font-spec :family "HanziPen SC")
@@ -850,12 +848,6 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     (set-face-attribute 'org-block-end-line nil :background nil :foreground nil :inherit 'shadow :slant 'italic)
     ;; (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height (face-attribute 'default :height))
     )
-
-  ;; (x-list-fonts "Ubuntu Mono")
-
-  ;; (set-frame-font "Ubuntu Mono")
-  ;; (x-list-fonts "WenQuanYi Zen Hei")
-  ;; (set-frame-font "WenQuanYi Zen Hei Mono")
 #+END_SRC
 *** variable-pitch-mode and fixed-pitch-mode
 [[https://yoo2080.wordpress.com/2013/05/30/monospace-font-in-tables-and-source-code-blocks-in-org-mode-proportional-font-in-other-parts/][monospace font in tables and source code blocks in org-mode, proportional font in other parts]]
@@ -1417,7 +1409,7 @@ and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github
 ** Eshell alias
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (defalias 'e 'find-file)
-  (defalias 'ff 'find-file)
+  (defalias 'ff 'find-file-other-window)
   (defalias 'ee 'find-files)
 #+END_SRC
 
@@ -1431,20 +1423,12 @@ set default eshell history folder
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (require 'utilities)
 
-  ;; (add-hook 'eshell-mode-hook (lambda ()
-  ;;                               (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer)))
-  ;; (add-hook 'eshell-mode-map (lambda () (interactive)
-  ;;                              (define-key eshell-mode-map (kbd "<tab>") 'completion-at-point)))
-
   (defun sd/eshell-hook ()
     (interactive)
     (define-key eshell-mode-map (kbd "C-j") #'eshell-send-input)
     (define-key eshell-mode-map (kbd "C-l") #'sd/eshell-clear-buffer))
 
   (add-hook 'eshell-mode-hook #'sd/eshell-hook)
-
-
-  ;; (add-hook 'eshell-mode-hook (apply-partially #'local-set-key (kbd "C-l") 'sd/eshell-clear-buffer))
 #+END_SRC
 
 ** Toggle Eshell

diff --git a/vim/vimrc b/vim/vimrc
index 8687824..5c4c06a 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -199,8 +199,9 @@ inoremap <C-U> <C-G>u<C-U>
 inoremap <C-a> <Home>
 inoremap <C-e> <End>
 inoremap <C-D> <Del>
-inoremap <C-b> <S-Left>
-inoremap <C-f> <S-Right>
+inoremap <C-b> <Left>
+inoremap <C-f> <Right>
+inoremap <C-/> <Esc>ui
 imap <A-d>     <S-Right><C-w>
 " }}}
 " Command mode ------------------------------------------------------- {{{

diff --git a/vimperatorrc b/vimperatorrc
index d5cb71f..d5a98d4 100644 (file)
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -1,6 +1,6 @@
 "3.8.2 (created: 2014/02/13 23:52:43)
 " To compatible with some pluins, and bugs
-" Keep Firefox at the version of 50.0
+" Keep Firefox at the version of (50.0) 55.0
 " And TabTree 1.5.1
 cd ~
 
@@ -63,7 +63,8 @@ set gui=nonavigation
 noremap <C-SPACE> <C-^>
 noremap v <C-^>
 " fix the issue on firefox49 history not working, https://github.com/vimperator/vimperator-labs/issues/590
-"js services.services.autoCompleteSearch.class_="@mozilla.org/autocomplete/search;1?name=unifiedcomplete"
+" js services.services.autoCompleteSearch.class_="@mozilla.org/autocomplete/search;1?name=unifiedcomplete"
+" js services.services.autoCompleteSearch.class_="@mozilla.org/autocomplete/search;1?name=unifiedcomplete"
 
 "https://github.com/vimperator/vimperator-labs/issues/740
 "set activate=

diff --git a/zsh/zshrc b/zsh/zshrc
index df74454..8162a2f 100644 (file)
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -326,3 +326,11 @@ export MANPATH="/Applications/Racket v6.6/man":$MANPATH;
 
 # export ~/.bin into PATH
 export PATH="$HOME/.bin":$PATH;
+
+
+# source Android bin
+[[ -f "$ZSHHOME/androidrc" ]] && . "$ZSHHOME/androidrc"
+
+if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"