From ff4721e0d20af835fd70749afaaf2c88ebbbf676 Mon Sep 17 00:00:00 2001 From: Dmitriy Likhten Date: Fri, 27 Sep 2019 16:02:08 -0400 Subject: [PATCH] mixlab custom --- .bash_alias | 5 +++++ .bash_profile | 14 ++++++++++++++ .bash_prompt | 1 + .exports | 7 ------- .gitconfig | 3 ++- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.bash_alias b/.bash_alias index cb807aa..63294d6 100644 --- a/.bash_alias +++ b/.bash_alias @@ -6,3 +6,8 @@ alias clear='echo "use command+k"' alias cd..='cd ..' alias rr='touch tmp/restart.txt' alias gut='git' +alias api='cd ~/developer/src/api' +alias client='cd ~/developer/src/client' +alias practice='cd ~/developer/src/practice' +alias marketing='cd ~/developer/src/marketing' +alias flooffy='cd ~/developer/src/flooffy' diff --git a/.bash_profile b/.bash_profile index 5db99d8..aeb7c00 100644 --- a/.bash_profile +++ b/.bash_profile @@ -51,3 +51,17 @@ test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shel # gitql export DYLD_LIBRARY_PATH=$PWD/libgit2/install/lib + +# nvm +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +[[ -s "$HOME/.avn/bin/avn.sh" ]] && source "$HOME/.avn/bin/avn.sh" # load avn + +# home bin folder for executables +export PATH="$HOME/developer/bin:$PATH" + +#heroku +if [ -f heroku ]; then + heroku autocomplete:script bash; +fi diff --git a/.bash_prompt b/.bash_prompt index 2f99c96..c5c1571 100644 --- a/.bash_prompt +++ b/.bash_prompt @@ -10,6 +10,7 @@ function __git_branch { } function __my_rvm_ruby_version { + # echo "r " echo "r`~/.rvm/bin/rvm-prompt v g` " } diff --git a/.exports b/.exports index bfb3301..26ea424 100644 --- a/.exports +++ b/.exports @@ -25,13 +25,6 @@ export EC2_AMITOOL_HOME="/usr/local/Cellar/ec2-ami-tools/1.3-45758/jars" # path export PATH=~/Developer/bin:~/Developer/usr/bin:/usr/local/sbin:$PATH -# "faster" rails startup time -export RUBY_HEAP_MIN_SLOTS=1000000 -export RUBY_HEAP_SLOTS_INCREMENT=1000000 -export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 -export RUBY_GC_MALLOC_LIMIT=100000000 -export RUBY_HEAP_FREE_MIN=500000 - export JAVA_HOME=$(/usr/libexec/java_home) export GOPATH=~/.go diff --git a/.gitconfig b/.gitconfig index d8347f3..46acb37 100644 --- a/.gitconfig +++ b/.gitconfig @@ -18,7 +18,8 @@ wip = !git add -u && git commit -m "WIP" undo-commit = reset --soft HEAD^ list-ignored = !git ls-files -v | grep \"^[[:lower:]]\" - pull-request = !git push origin && open "https://github.com/DonorsChoose/donorschoose-web/compare/resolved...dlikhten:`git symbolic-ref --short HEAD`" + github-location = "!f() { git remote -v | grep 'origin' | grep '(push)' | sed 's/.*git@github.com://' | sed 's/\\.git.*//'; }; f" + pull-request = !git push origin && open "https://github.com/`git github-location`/compare/develop...`git symbolic-ref --short HEAD`" p = push origin pf = push origin --force pr = pull --rebase dc-master resolved