Update zsh options; remove opensource & internal aliases

[dotfiles.git] / zsh_login

diff --git a/zsh_login b/zsh_login
index 032a58d2d32dc81777f478471b4d062de45a0f77..2a24355e0bdee9b4084433e3126154d6274b17cc 100644 (file)
--- a/zsh_login
+++ b/zsh_login
@@ -5,8 +5,12 @@ if [[ "$terminfo[colors]" -ge 8 ]]; then
   colors
 fi
 
+# Set up tab completion
+fpath=(~/.dotfiles/completions "${fpath[@]}")
 autoload -U compinit
 compinit
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+zstyle ':completion:*' list-colors 'di=36;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
 
 # Set up VCS Prompt
 autoload -Uz vcs_info
@@ -20,24 +24,40 @@ precmd() {
   [[ -n $vcs_info_msg_0_ ]] && psvar[1]="$vcs_info_msg_0_"
 }
 
+__git_files () { 
+    _wanted files expl 'local files' _files     
+}
+
 setopt PROMPT_SUBST
-setopt INC_APPEND_HISTORY
 setopt SHARE_HISTORY
 setopt extended_glob
+setopt AUTO_CD
+setopt DVORAK
+setopt CDABLE_VARS
+setopt CD_SILENT
 
-PS1=$'\(zsh) %(?.%F{green}:-\)%f.%F{red}:-(%f) %(1v.%1v .)%n@%m:%(3~,.../,)%2~> '
-PATH=~/bin:$PATH
+PS1=$'%(?.😊.😡)  %(1v.%1v .)%n@%m:%(3~,.../,)%2~> '
+PATH=~/bin:$PATH:~/homebrew/bin:
+
+if [[ -d ~/homebrew/bin ]]; then
+       PATH=$PATH:~/homebrew/bin
+fi
 
 HISTFILE=~/.zsh_history
 HISTSIZE=5000
 SAVEHIST=1000
+WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
 
 export MANPATH=~/man:$MANPATH
+
+if [[ -d ~/homebrew/share/man ]]; then
+       MANPATH=$MANPATH:~/homebrew/share/man
+fi
+
 export EDITOR=/usr/bin/vim
 export LSCOLORS=gxfxcxdxbxegedabagacad
 
-zstyle ':completion:*' list-colors 'di=36;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
+export CDPATH=~
 
 source ~/.dotfiles/zsh_aliases
 source ~/.dotfiles/zsh_webkit_login
-