Merge branch 'master' of gogs.tforgione.fr:tforgione/dotfiles

This commit is contained in:
Thomas FORGIONE 2016-12-03 10:41:49 +01:00
commit b347504d13
No known key found for this signature in database
GPG Key ID: 2B5C8A9986271A42
2 changed files with 9 additions and 14 deletions

View File

@ -1,8 +1,12 @@
# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh
ZSH_CUSTOM=$DOTFILES/zsh/oh-my-zsh
# Check if zshrc has been modified
# I like jokes, but I prefer when I'm the one who makes them
git -C $DOTFILES diff --exit-code zshrc zsh > /dev/null 2>&1
ZSH_THEME="laptop"
if [ $? -ne 0 ]; then
echo >&2 "Your zshrc has been modified... nothing will be executed, please check it"
alias source=:
return
fi
# Set to this to use case-sensitive completion
# CASE_SENSITIVE="true"

11
zshrc
View File

@ -3,23 +3,14 @@
# Path to the dotfiles
DOTFILES=$HOME/.config/dotfiles
# Check if zshrc has been modified
# I like jokes, but I prefer when I'm the one who makes them
git -C $DOTFILES diff --exit-code zshrc zsh > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo >&2 "Your zshrc has been modified... nothing will be executed, please check it"
return
fi
# Path to your oh-my-zsh configuration
ZSH=$HOME/.oh-my-zsh
ZSH_CUSTOM=$HOME/.config/dotfiles/zsh/oh-my-zsh
ZSH_THEME="laptop"
source $DOTFILES/zsh/exports.zsh
source $DOTFILES/zsh/config.zsh
source $DOTFILES/zsh/exports.zsh
source $DOTFILES/zsh/aliases.zsh
source $DOTFILES/zsh/functions.zsh