Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2016-04-19 18:34:23 +02:00
2 changed files with 5 additions and 5 deletions

View File

@@ -5,11 +5,6 @@ export PATH="$HOME/local/bin:$PATH"
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
# Base16 Shell
BASE16_SCHEME="solarized"
BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
########################
# Dist related settings
########################

5
zshrc
View File

@@ -60,3 +60,8 @@ bindkey '^N' down-history
bindkey '^r' history-incremental-search-backward
bindkey ' ' magic-space
# Base16 Shell
BASE16_SCHEME="solarized"
BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL