فهرست منبع

Update oh-my-zsh, switch fancy-ctrl-z to plugin

Also clean up comments and commented code.
Weiyi Lou 10 سال پیش
والد
کامیت
0490ebfc84
6فایلهای تغییر یافته به همراه9 افزوده شده و 27 حذف شده
  1. 2 2
      vim/vimrc
  2. 1 4
      zsh/custom/auto-ssh-hosts.zsh
  3. 0 5
      zsh/custom/correction.zsh
  4. 0 14
      zsh/custom/lib/key-bindings.zsh
  5. 1 1
      zsh/oh-my-zsh
  6. 5 1
      zsh/zshrc

+ 2 - 2
vim/vimrc

@@ -1,8 +1,8 @@
 " vim: set sw=2 ts=2 sts=2 et tw=80 fmr={{{,}}} fdl=0 fdm=marker:
 "
-" The Main VIMRC
+" The Main Vim Config File
 "
-" Configures have-anywhere, plugin-independent settings and mappings.
+" Contains plugin-independent, have-anywhere settings and mappings.
 "
 " Loads plugins from `~/dotfiles/plugins.vim`.
 " Loads additional settings from `~/dotfiles/vim/settings/*.vim`.

+ 1 - 4
zsh/custom/auto-ssh-hosts.zsh

@@ -1,9 +1,6 @@
-#
 # Automagic ssh to known hosts.
-# Thanks to:
-# https://github.com/dangerous/dotfiles
-# Works in conjunction with .ssh/config for username@hostname
 #
+# Works in conjunction with .ssh/config for username@hostname
 
 ## hosts file
 alias hosts='sudo vim /etc/hosts'

+ 0 - 5
zsh/custom/correction.zsh

@@ -2,8 +2,3 @@
 alias cp='nocorrect cp'
 alias ln='nocorrect ln'
 alias touch='nocorrect touch'
-
-# Stop zsh from completing with characters mid-word i.e. y completes to weiyi
-# I have found mid-word completion to be quite useful, so this is just here for
-# reference.
-# zstyle ':completion:*' matcher-list ''

+ 0 - 14
zsh/custom/lib/key-bindings.zsh

@@ -49,20 +49,6 @@ if [[ "${terminfo[kcud1]}" != "" ]]; then
   bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
 fi
 
-# Ctrl-z for `fg`
-# From http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
-fancy-ctrl-z () {
-  if [[ $#BUFFER -eq 0 ]]; then
-    BUFFER="fg"
-    zle accept-line
-  else
-    zle push-input
-    zle clear-screen
-  fi
-}
-zle -N fancy-ctrl-z
-bindkey '^Z' fancy-ctrl-z
-
 # <S-Tab> to tab backwards through autocomplete suggestions.
 bindkey '^[[Z' reverse-menu-complete
 

+ 1 - 1
zsh/oh-my-zsh

@@ -1 +1 @@
-Subproject commit ba5fd57c1ff4a8523715bab6acc35dbbeff88af7
+Subproject commit e44aa50301cbdb9c713193263e6c0c5a9a5798c0

+ 5 - 1
zsh/zshrc

@@ -10,6 +10,10 @@ ZSH_THEME="cinaeco"
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
 # Uncomment the following line to disable bi-weekly auto-update checks.
 DISABLE_AUTO_UPDATE="true"
 
@@ -46,7 +50,7 @@ ZSH_CUSTOM=$HOME/dotfiles/zsh/custom
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git colored-man z)
+plugins=(git colored-man-pages fancy-ctrl-z z)
 
 # User configuration