Merge branch 'master' of github.com:GeoffreyFrogeye/dotfiles

This commit is contained in:
Geoffrey Frogeye 2016-03-16 14:23:51 +01:00
commit c313677246
2 changed files with 5 additions and 2 deletions

6
bashrc
View file

@ -1,10 +1,12 @@
# Custom scripts
#find ~/.scripts/ ~/.gscripts/ -type f -name "*.sh" | while read script; do
#source "$script"
#done
source ~/.scripts/index.sh
source ~/.gscripts/index.sh
[ -f ~/.scripts/index.sh ] && source ~/.scripts/index.sh
[ -f ~/.gscripts/index.sh ] && source ~/.gscripts/index.sh
# Prompt
if [[ $USER == 'root' ]]; then

1
vimrc
View file

@ -217,6 +217,7 @@ set updatetime=250
syntax enable
set background=dark
set t_Co=256
colorscheme solarized
" From http://stackoverflow.com/a/5004785/2766106