From 265a7513295b8f9c1f344a60097bc0e3191fb4ea Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 13 Jul 2016 13:38:11 +0100 Subject: [PATCH] More verbose setup --- bootstrap.sh | 5 +++++ zshrc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index c7c704a..0e5cc90 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -4,9 +4,11 @@ BASEDIR=$(pwd) # Update git submodules +echo "Updating git submodules" git submodule init && git submodule update # ln the various files +echo "Sym-linking the various config files" test -L $HOME/.curlrc || ln -f -s $BASEDIR/curlrc $HOME/.curlrc test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore test -L $HOME/.hushlogin || ln -f -s $BASEDIR/hushlogin $HOME/.hushlogin @@ -15,12 +17,15 @@ test -L $HOME/.ncmpcpp/config || ln -f -s $BASEDIR/ncmpcpp $HOME/.ncmpcpp/config test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc $HOME/.zshrc # ln vim files +echo "Setting up vim" test -d $HOME/.vim && rm -rf $HOME/.vim ln -s $BASEDIR/vim $HOME/.vim test -L $HOME/.vimrc || ln -f -s $HOME/.vim/vimrc $HOME/.vimrc # .gitconfig gets edited by .extra so we won’t symlink it, but copy it +echo "For compatability we chall copy the global gitconfig" cp $BASEDIR/gitconfig $HOME/.gitconfig # Source zshrc +echo "And finally, source the .zshrc" source $HOME/.zshrc diff --git a/zshrc b/zshrc index b4011d6..0780658 100644 --- a/zshrc +++ b/zshrc @@ -137,9 +137,9 @@ alias up="sudo pacman -Syu" # credit Paul Irish: https://github.com/paulirish/dotfiles/blob/606d85f083eb53853789ce9dcaf31a49756471bd/.zshrc#L80 # Automatically list directory contents on `cd`. auto-ls () { - emulate -L zsh; - # explicit sexy ls'ing as aliases arent honored in here. - hash gls >/dev/null 2>&1 && CLICOLOR_FORCE=1 gls -aFh --color --group-directories-first || ls + emulate -L zsh; + # explicit sexy ls'ing as aliases arent honored in here. + hash gls >/dev/null 2>&1 && CLICOLOR_FORCE=1 gls -aFh --color --group-directories-first || ls } chpwd_functions=( auto-ls $chpwd_functions )