diff --git a/vim/settings/python-mode.vim b/vim/settings/python-mode.vim index 4d035dd..5dfe83e 100644 --- a/vim/settings/python-mode.vim +++ b/vim/settings/python-mode.vim @@ -19,6 +19,6 @@ augroup filetype_python autocmd FileType python nnoremap c I#cesc> autocmd FileType python :iabbrev iff if: autocmd FileType python highlight Excess ctermbg=DarkGrey guibg=Black - autocmd FileType python match Excess /\%80v.*/ + autocmd FileType python match Excess /\%120v.*/ autocmd FileType python set nowrap augroup END diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 5df3b39..8a146f6 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -220,6 +220,7 @@ alias emacs="env LC_CTYPE=zh_CN.UTF-8 emacs" git config --global alias.df "diff HEAD^ HEAD" git config --global alias.caa "commit -a --amend" alias dc=docker-compose +alias dw='docker-compose exec web' alias start_dropbox='~/.dropbox-dist/dropboxd' alias unzip_CN="unzip -O GB18030" alias cnpm="npm --registry=https://registry.npm.taobao.org \ diff --git a/zsh/fasd.zsh b/zsh/fasd.zsh index 81c895c..7382899 100644 --- a/zsh/fasd.zsh +++ b/zsh/fasd.zsh @@ -15,3 +15,4 @@ alias d='fasd -d' # directory alias f='fasd -f' # file alias z='fasd_cd -d' # cd, same functionality as j in autojump alias zz='fasd_cd -d -i' # interactive directory jump +alias v='f -e vim' diff --git a/zsh/functions.zsh b/zsh/functions.zsh index 8fa9fba..e064161 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -82,8 +82,7 @@ function test_proxy() { curl www.google.com } function set_proxy() { - export http_proxy=http://127.0.0.1:8118/ - export https_proxy=http://127.0.0.1:8118/ + export all_proxy=http://127.0.0.1:8118/ # export https_proxy=socks5://127.0.0.1:1080/ # export http_proxy=socks5://127.0.0.1:1080/ } @@ -92,8 +91,7 @@ function set_ss_proxy() { export http_proxy=socks5://127.0.0.1:1080/ } function unset_proxy() { - unset https_proxy - unset http_proxy + unset all_proxy } function install_jsctags { npm install jsctags -g diff --git a/zsh/git.zsh b/zsh/git.zsh index c87ec5a..77b4fec 100644 --- a/zsh/git.zsh +++ b/zsh/git.zsh @@ -2,3 +2,4 @@ __git_files () { _wanted files expl 'local files' _files } +alias gfR='gf origin master; gwR origin/master' diff --git a/zsh/key-bindings.zsh b/zsh/key-bindings.zsh index ea3c04c..8141096 100644 --- a/zsh/key-bindings.zsh +++ b/zsh/key-bindings.zsh @@ -15,7 +15,6 @@ bindkey -M viins '^n' down-line-or-history bindkey -M viins '^y' yank bindkey -M viins '^w' backward-kill-word bindkey -M viins '^u' backward-kill-line -bindkey -M viins '^h' backward-delete-char bindkey -M viins '^?' backward-delete-char bindkey -M viins '^_' undo bindkey -M viins '^x^r' redisplay