X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/blobdiff_plain/6ec9bafb8ea448b7a1dd4499994787e0df51f96b..1c2a05f18c3aa2f41186a91de5dcd0cc1e59040a:/zshrc

diff --git a/zshrc b/zshrc
index 12bd9c1..1a227db 100644
--- a/zshrc
+++ b/zshrc
@@ -8,88 +8,9 @@ umask 022
 
 # setopt prompt_subst
 
+alias vim='/Applications/MacVim.app/Contents/MacOS/Vim'
 export EDITOR="vim"
 
-
-## Include local bin stuff on the path, if they are there.
-#if [ -d $HOME/bin ]; then
-#	PATH=$PATH:$HOME/bin 
-#fi
-#
-## Set screen title when SSH-ing
-#ssh() {
-#	args=$@
-#	echo -ne "\033k${args##* }\033\\";
-#	env ssh "$@";
-#	# Set window title back here!
-#}
-#
-## Many thanks to https://github.com/robbyrussell/oh-my-zsh/blob/master/lib/completion.zsh
-## Same guy who wrote antigen! Awesome!
-#
-## disable named-directories autocompletion
-#zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
-#cdpath=(.)
-#
-## SSH Completion should include ~/.ssh/config
-#[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
-#[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
-#[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
-#[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
-#hosts=(
-#  "$_ssh_config[@]"
-#  "$_global_ssh_hosts[@]"
-#  "$_ssh_hosts[@]"
-#  "$_etc_hosts[@]"
-#  "$HOST"
-#  localhost
-#)
-#zstyle ':completion:*:hosts' hosts $hosts
-#zstyle ':completion:*' users off
-#
-## Use caching so that commands like apt and dpkg complete are useable
-#zstyle ':completion::complete:*' use-cache 1
-#zstyle ':completion::complete:*' cache-path $ZSH/cache/
-#
-## Don't complete uninteresting users
-#zstyle ':completion:*:*:*:users' ignored-patterns \
-#        adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
-#        dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
-#        hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
-#        mailman mailnull mldonkey mysql nagios \
-#        named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
-#        operator pcap postfix postgres privoxy pulse pvm quagga radvd \
-#        rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs
-#
-#source ~/.vim/bundle/minion/add_to_your_profile
-#source ~/.vim/bundle/minion/aliases_for_minion
-#
-#if [ -f ~/.krb5.conf ]; then
-## For Exchange Perl connector.
-#	export KRB5_CONFIG=$HOME/.krb5.conf
-#fi
-#
-#if [ -f ~/dotfiles/prompt.py ]; then
-#	precmd() {
-#		PROMPT=`/usr/bin/python ~/dotfiles/prompt.py ~/dotfiles/prompt.txt`
-#	}
-#fi
-#
-#if [ -f /usr/bin/xscreensaver ]; then
-#	    alias lock="xscreensaver -l"
-#fi
-#
-#if [ -f ~/dotfiles/scripts/add_to_your_profile ]; then
-#	source ~/dotfiles/scripts/add_to_your_profile
-#fi
-#
-#if [ -f ~/.vim/bundle/vim-todo/bin ]; then
-#	source ~/.vim/bundle/vim-todo/bin
-#fi
-#
-#
-#alias gitlog git log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-
 alias vi vim
 
 function ssh-copy-id {
@@ -143,10 +64,14 @@ antigen bundle command-not-found
 antigen bundle zsh-users/zsh-syntax-highlighting
 
 # Nice multiline git-aware prompt.
-antigen bundle sindresorhus/pure
+# antigen bundle sindresorhus/pure
+#   Does not play nicely with Git two-factor auth / SSH key auth
+
+# Automatically activate virtualenvs
+antigen bundle sharat87/autoenv
 
-# Quickly create and fetch text files.
-antigen bundle edthedev/minion
+# Git Aware Prompt
+antigen bundle nojhan/liquidprompt
 
 # # Tell antigen that you're done.
 antigen apply