diff --git a/osx/env.platform b/osx/env.platform new file mode 100644 index 0000000..94ebfde --- /dev/null +++ b/osx/env.platform @@ -0,0 +1,2 @@ +export CMAKE_CXX_COMPILER=/Library/Developer/CommandLineTools/usr/bin/c++ +export CMAKE_C_COMPILER=/Library/Developer/CommandLineTools/usr/bin/cc diff --git a/osx/install.sh b/osx/install.sh index fbe5e28..512885d 100755 --- a/osx/install.sh +++ b/osx/install.sh @@ -21,6 +21,12 @@ fi set -e +printf "Installing env...\n" +ln -sf $HOME/.dotfiles/osx/env.platform $HOME/.env.platform + +printf "Installing git customizations...\n" +ln -sf $HOME/.dotfiles/osx/gitconfig.platform $HOME/.gitconfig.platform + printf "Installing Homebrew..." if [ ! -d "/usr/local/Homebrew" ]; then /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" diff --git a/windows/bashrc b/windows/bashrc index 9054aff..43a611e 100644 --- a/windows/bashrc +++ b/windows/bashrc @@ -2,6 +2,7 @@ test -f ~/.aliases && . ~/.functions test -f ~/.aliases && . ~/.aliases test -f ~/.private-dotfiles/env && . ~/.private-dotfiles/env +test -f ~/.env.platform && . ~/.env.platform # Unbreak broken, non-colored terminal export TERM=xterm-256color diff --git a/zshenv b/zshenv index a73d30c..f225316 100644 --- a/zshenv +++ b/zshenv @@ -1,6 +1,9 @@ platform=`uname -s` kernel_release=`uname -r` +test -f ~/.private-dotfiles/env && . ~/.private-dotfiles/env +test -f ~/.env.platform && . ~/.env.platform + # Unbreak broken, non-colored terminal export TERM=xterm-256color @@ -12,20 +15,7 @@ export GREP_OPTIONS="-nRi --color --exclude-dir=.git --exclude-dir=tmp --exclud export RBENV_PATH="$HOME/.rbenv" -export RUBY_HEAP_MIN_SLOTS=1000000 # for < 2.1.1, will raise warning when using 2.1.1 -export RUBY_GC_HEAP_INIT_SLOTS=1000000 # for 2.1.1 -export RUBY_HEAP_SLOTS_INCREMENT=1000000 -export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 -export RUBY_GC_MALLOC_LIMIT=1000000000 -export RUBY_HEAP_FREE_MIN=500000 - -# Setup Ansible -ANSIBLE_DIR=$HOME/.personal-files/open-source/ansible -export PYTHONPATH=${ANSIBLE_DIR}/lib:${PYTHONPATH} -export ANSIBLE_LIBRARY=${ANSIBLE_DIR}/library -export ANSIBLE_HOSTS=~/.ansible_hosts export LEIN_FAST_TRAMPOLINE=y -export ANDROID_HOME=/usr/local/opt/android-sdk if [[ $platform == 'Linux' ]]; then export LD_LIBRARY_PATH="/usr/lib/jvm/java-8-openjdk/jre/lib/amd64" @@ -35,13 +25,14 @@ if [[ $platform == 'Linux' ]]; then export LOLCOMMITS_DIR="/shared/Dev/lolcommits" fi -#export PATH=/usr/local/sbin:/usr/local/bin:${PATH} -path=($HOME/bin $HOME/.dotfiles/bin ${ANSIBLE_DIR}/bin ${RBENV_PATH}/bin $HOME/.vim/scripts $path) +path=($HOME/bin $HOME/.dotfiles/bin ${RBENV_PATH}/bin $HOME/.vim/scripts $path) if [[ $platform == 'Darwin' ]]; then test -f $HOME/.cargo && source $HOME/.cargo/env # TODO: test for qt - path=($HOME/Qt/5.8/clang_64/bin $path) + if [ -d "$HOME/Qt" ]; then + path=($HOME/Qt/5.8/clang_64/bin $path) + fi fi if [ -d "$HOME/.rbenv" ]; then