Browse Source

Update zsh config (#5)

Fix complete:13: command not found: compdef
ubuntu_ci
Ein Verne 4 years ago committed by GitHub
parent
commit
5a0e45c5fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      .zshrc
  2. 2
      zsh/alias.zsh
  3. 0
      zsh/common.zsh
  4. 0
      zsh/env.zsh
  5. 0
      zsh/keybindings.zsh

13
.zshrc

@ -1,6 +1,7 @@
# If you come from bash you might have to change your $PATH. # If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH # export PATH=$HOME/bin:/usr/local/bin:$PATH
autoload -Uz compinit && compinit
# you need to git clone [email protected]:zsh-users/antigen.git to $HOME # you need to git clone [email protected]:zsh-users/antigen.git to $HOME
if [[ -d $HOME/antigen ]]; then if [[ -d $HOME/antigen ]]; then
source $HOME/antigen/antigen.zsh source $HOME/antigen/antigen.zsh
@ -125,10 +126,10 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=6'
#transfer() { if [ $# -eq 0 ]; then echo -e "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi #transfer() { if [ $# -eq 0 ]; then echo -e "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi
#tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://transfer.sh/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://transfer.sh/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; } #tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://transfer.sh/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://transfer.sh/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; }
source $HOME/dotfiles/conf/zsh/common.zsh source $HOME/dotfiles/zsh/common.zsh
source $HOME/dotfiles/conf/zsh/keybindings.zsh source $HOME/dotfiles/zsh/keybindings.zsh
source $HOME/dotfiles/conf/zsh/alias.zsh source $HOME/dotfiles/zsh/alias.zsh
source $HOME/dotfiles/conf/zsh/env.zsh source $HOME/dotfiles/zsh/env.zsh
if [[ -f ~/.zshrc.local ]]; then if [[ -f ~/.zshrc.local ]]; then
source $HOME/.zshrc.local source $HOME/.zshrc.local
@ -136,7 +137,6 @@ fi
ZSH_DISABLE_COMPFIX=true ZSH_DISABLE_COMPFIX=true
autoload -Uz compinit && compinit
fpath=(~/.zsh/completions $fpath) fpath=(~/.zsh/completions $fpath)
# space # space
@ -152,9 +152,6 @@ SPACESHIP_DIR_COLOR="${SPACESHIP_DIR_COLOR="cyan"}"
# usage adb-screencap > screen.png # usage adb-screencap > screen.png
alias adbcap="adb shell screencap -p" alias adbcap="adb shell screencap -p"
alias proxy='export all_proxy=socks5://127.0.0.1:1080'
alias unproxy='unset all_proxy'
# fzf config # fzf config
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git --ignore .idea -l -g ""' export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git --ignore .idea -l -g ""'

2
conf/zsh/alias.zsh → zsh/alias.zsh

@ -16,3 +16,5 @@ alias mci="mvn -e -U clean install"
# https://stackoverflow.com/a/15503178/1820217 # https://stackoverflow.com/a/15503178/1820217
alias gitlog="git ls-files -z | xargs -0n1 git blame -w --show-email | perl -n -e '/^.*?\((.*?)\s+[\d]{4}/; print $1,"\n"' | sort -f | uniq -c | sort -n" alias gitlog="git ls-files -z | xargs -0n1 git blame -w --show-email | perl -n -e '/^.*?\((.*?)\s+[\d]{4}/; print $1,"\n"' | sort -f | uniq -c | sort -n"
alias proxy='export all_proxy=socks5://127.0.0.1:1080'
alias unproxy='unset all_proxy'

0
conf/zsh/common.zsh → zsh/common.zsh

0
conf/zsh/env.zsh → zsh/env.zsh

0
conf/zsh/keybindings.zsh → zsh/keybindings.zsh

Loading…
Cancel
Save