More verbose setup

This commit is contained in:
Jonny Barnes 2016-07-13 13:38:11 +01:00
parent 24ba83ab9b
commit 265a751329
2 changed files with 8 additions and 3 deletions

View file

@ -4,9 +4,11 @@
BASEDIR=$(pwd) BASEDIR=$(pwd)
# Update git submodules # Update git submodules
echo "Updating git submodules"
git submodule init && git submodule update git submodule init && git submodule update
# ln the various files # 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/.curlrc || ln -f -s $BASEDIR/curlrc $HOME/.curlrc
test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore
test -L $HOME/.hushlogin || ln -f -s $BASEDIR/hushlogin $HOME/.hushlogin 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 test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc $HOME/.zshrc
# ln vim files # ln vim files
echo "Setting up vim"
test -d $HOME/.vim && rm -rf $HOME/.vim test -d $HOME/.vim && rm -rf $HOME/.vim
ln -s $BASEDIR/vim $HOME/.vim ln -s $BASEDIR/vim $HOME/.vim
test -L $HOME/.vimrc || ln -f -s $HOME/.vim/vimrc $HOME/.vimrc test -L $HOME/.vimrc || ln -f -s $HOME/.vim/vimrc $HOME/.vimrc
# .gitconfig gets edited by .extra so we wont symlink it, but copy it # .gitconfig gets edited by .extra so we wont symlink it, but copy it
echo "For compatability we chall copy the global gitconfig"
cp $BASEDIR/gitconfig $HOME/.gitconfig cp $BASEDIR/gitconfig $HOME/.gitconfig
# Source zshrc # Source zshrc
echo "And finally, source the .zshrc"
source $HOME/.zshrc source $HOME/.zshrc

6
zshrc
View file

@ -137,9 +137,9 @@ alias up="sudo pacman -Syu"
# credit Paul Irish: https://github.com/paulirish/dotfiles/blob/606d85f083eb53853789ce9dcaf31a49756471bd/.zshrc#L80 # credit Paul Irish: https://github.com/paulirish/dotfiles/blob/606d85f083eb53853789ce9dcaf31a49756471bd/.zshrc#L80
# Automatically list directory contents on `cd`. # Automatically list directory contents on `cd`.
auto-ls () { auto-ls () {
emulate -L zsh; emulate -L zsh;
# explicit sexy ls'ing as aliases arent honored in here. # 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 hash gls >/dev/null 2>&1 && CLICOLOR_FORCE=1 gls -aFh --color --group-directories-first || ls
} }
chpwd_functions=( auto-ls $chpwd_functions ) chpwd_functions=( auto-ls $chpwd_functions )