From 02b454f21aac486a751f2fb073ae1cab5e431c2d Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sat, 3 Jan 2015 00:34:38 -0500
Subject: [PATCH] Fixed issues

---
 scripts/sync.sh |  4 ++--
 shells/zshrc    | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
index 8c00fd7..8e1c6b0 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -11,7 +11,7 @@ while getopts ":hbsdpcw" VALUE "$@"; do
     echo "    -w Installs wemux [requires vim]"
   fi
   if [ "$VALUE" = "b" ] ; then
-    rm ~/.vimrc 
+    trash ~/.vimrc || rm ~/.vimrc 
     ln -s $ABSPATH/vim/vimrc ~/.vimrc
     vim +"silent! call Initialize()" +q
   fi
@@ -59,11 +59,11 @@ while getopts ":hbsdpcw" VALUE "$@"; do
     ln -s $ABSPATH/vimperator/vimPgray.vimp ~/.vimperator/colors/vimPgray.vimp
     ln -s $ABSPATH/git/gitconfig ~/.gitconfig
     ln -s $ABSPATH/shells/bashrc ~/.bashrc
+    ln -s $ABSPATH/shells/zshrc ~/.zshrc
     if [ ! -d ~/.fzf ] ; then
       git clone https://github.com/stonewareslord/fzf.git ~/.fzf
       ~/.fzf/install -y
     fi
-    ln -s $ABSPATH/shells/zshrc ~/.zshrc
     if [ ! -d ~/.antigen ] ; then
       git clone https://github.com/zsh-users/antigen ~/.antigen
     fi
diff --git a/shells/zshrc b/shells/zshrc
index 4814ff3..ace2ec1 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -1,4 +1,4 @@
-export ZSH=$HOME/.oh-my-zsh
+export ZSH=/home/stonewareslord/.antigen/repos/https-COLON--SLASH--SLASH-github.com-SLASH-robbyrussell-SLASH-oh-my-zsh.git
 ZSH_THEME="af-magic"
 # Uncomment the following line to enable command auto-correction.
 # ENABLE_CORRECTION="true"
@@ -21,6 +21,7 @@ antigen bundle stonewareslord/oh-my-git
 antigen use oh-my-zsh
 antigen theme stonewareslord/oh-my-git-themes af-magic
 antigen bundle stonewareslord/liquidprompt
+antigen bundle zsh-users/zsh-completions src
 antigen apply
 
 # Would you like to use another custom folder than $ZSH/custom?
@@ -55,10 +56,11 @@ alias tmux='tmux -2'
 alias tree='tree -C'
 #alias grep="egrep -i --color=auto"
 alias skim="(head -5; tail -5) <"
-alias cp="rsync -ha --info=progress2"
-alias mv="mv -v"
-alias m="mv"
-alias c="cp"
+function cp() { rsync -ha --info=progress2 "$@" }
+function c() { cp "$@" }
+function mv() { /bin/mv -v "$@" }
+function m() { mv "$@" }
+compdef _cp c m mv cp
 alias la='ls -lah $LS_COLOR'
 alias dt='date "+%F %T"'
 alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'