diff options
| author | shmibs <shmibs@gmail.com> | 2017-11-27 01:08:51 -0700 |
|---|---|---|
| committer | shmibs <shmibs@gmail.com> | 2017-11-27 01:08:51 -0700 |
| commit | c688f7bce20158661f377e9679c3b2ce8b963fc6 (patch) | |
| tree | cd0b66a81272918b7bb622c2b905d699ad058ab5 /.zshrc | |
| parent | 66b00763352ccbc4af59259472a39249dc4345d6 (diff) | |
| parent | a0f41b26800251aa05cbd042c8852ec8e212a95b (diff) | |
| download | dotfiles-c688f7bce20158661f377e9679c3b2ce8b963fc6.tar.gz | |
Merge branch 'master' of github.com:shmibs/dotfiles
Diffstat (limited to '.zshrc')
| -rw-r--r-- | .zshrc | 36 |
1 files changed, 20 insertions, 16 deletions
@@ -77,11 +77,14 @@ fi ################# HIGHLIGHTING ################ -if [[ -f '/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' ]]; then - source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -else - source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -fi +local HIGHLIGHT_DIR='~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' +[[ -f '/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' ]] && \ + HIGHLIGHT_DIR='/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' +[[ -f '/usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' ]] && \ + HIGHLIGHT_DIR='/usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' + +source $HIGHLIGHT_DIR + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) #ZSH_HIGHLIGHT_STYLES[alias]="fg=yellow" @@ -121,16 +124,17 @@ key[Down]='^[[B' key[Right]='^[[C' bindkey ${key[Backspace]} backward-delete-char -bindkey ${key[Insert]} overwrite-mode -bindkey ${key[Home]} beginning-of-line -bindkey ${key[Delete]} delete-char -bindkey ${key[End]} end-of-line -bindkey ${key[Up]} up-line-or-search -bindkey ${key[Left]} backward-char -bindkey ${key[Down]} down-line-or-search -bindkey ${key[Right]} forward-char -bindkey ${key[PageUp]} history-beginning-search-backward -bindkey ${key[PageDown]} history-beginning-search-forward +bindkey ${key[Insert]} overwrite-mode +bindkey ${key[Home]} beginning-of-line +bindkey ${key[Delete]} delete-char +bindkey ${key[End]} end-of-line +bindkey ${key[Up]} up-line-or-search +bindkey ${key[Left]} backward-char +bindkey ${key[Down]} down-line-or-search +bindkey ${key[Right]} forward-char +bindkey ${key[PageUp]} history-beginning-search-backward +bindkey ${key[PageDown]} history-beginning-search-forward + bindkey '^W' backward-kill-word bindkey '^U' backward-kill-line bindkey '^P' up-history @@ -159,7 +163,7 @@ fi [[ ! -z $(whence aiksaurus) ]] && alias thesaurus='aiksaurus' [[ ! -z $(whence ag) ]] && alias ag='ag --color-match "1;34"' [[ ! -z $(whence latex) ]] && alias latex='latex -output-format=pdf' -[[ ! -z $(whence startx) ]] && alias sx='startx' +[[ ! -z $(whence startx) ]] && alias sx="startx -dpi $dpi" if [[ ! -z $(whence udevil) ]] then alias vmount='udevil mount' |