Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updates

  • Loading branch information...
commit 9a5db57c4de965d89b920a7ce946fb0678996788 1 parent 15e523f
@dz authored
Showing with 30 additions and 8 deletions.
  1. +27 −4 bash/bashrc
  2. +0 −1  emacsd/vendor/gist.el
  3. +3 −3 vim/vimrc
View
31 bash/bashrc
@@ -3,6 +3,10 @@
# Inspired greatly by Armin Ronacher's bashrc
# https://github.com/mitsuhiko/dotfiles/blob/master/bash/bashrc
+# setup gcc
+export CC=gcc-4.2
+export CXX=g++-4.2
+
# If not running interactively, don't do anything
[ -z "$PS1" ] && return
@@ -20,12 +24,16 @@ else
fi
VCPROMPT_EXECUTABLE=/usr/bin/vcprompt
-SSHUTTLE_EXECUTABLE=/usr/bin/vcprompt
+RVMPROMPT_EXECUTABLE=~/.rvm/bin/rvm-prompt
function vcprompt() {
$VCPROMPT_EXECUTABLE -f $' (\033[31;1m%[unknown]b\033[32;1m%m%u\033[37;1m)'
}
+function rvmprompt() {
+ $RVMPROMPT_EXECUTABLE u v g
+}
+
function lastcommandfailed() {
code=$?
if [ $code != 0 ]; then
@@ -49,7 +57,7 @@ function backgroundjobs() {
'
}
-export BASEPROMPT='\e${GREEN_COLOR}\w\e${GRAY_COLOR}$(vcprompt)\e${GRAY_COLOR} \e${USER_COLOR}\u\e${DEFAULT_COLOR}'
+export BASEPROMPT='\e${GREEN_COLOR}\w \e${GRAY_COLOR}(\e${CYAN_COLOR}$(rvmprompt)\e${GRAY_COLOR})\e${GRAY_COLOR}$(vcprompt)\e${GRAY_COLOR} \e${USER_COLOR}\u\e${DEFAULT_COLOR}'
export PROMPT="${BASEPROMPT}$ "
export PS1=$PROMPT
@@ -104,8 +112,23 @@ alias slt='open -a "Sublime Text 2"'
#vim aliases
alias vim="/Applications/MacVim.app/Contents/MacOS/Vim"
+# set editor to vim
+export EDITOR='vim'
+
#things for bash history to ignore
export HISTIGNORE="&:ls:[bf]g:exit:clear:c"
-export WORKON_HOME=~/.virtualenvs
-source /usr/local/share/python/virtualenvwrapper.sh
+PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+PATH="/usr/local/bin:${PATH}"
+export PATH
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function
+
+# mysql path
+export PATH="/usr/local/mysql/bin:$PATH"
+
+# solr setup
+export SOLR_HOME=~/Documents/Vox/solr14
+
1  emacsd/vendor/gist.el
@@ -1 +0,0 @@
-Subproject commit 89f790330046231c300fdfd5c02e340d40635d3f
View
6 vim/vimrc
@@ -49,9 +49,9 @@ set laststatus=2
set showmatch
set expandtab
-set shiftwidth=4
-set softtabstop=4
-set tabstop=8
+set shiftwidth=2
+set softtabstop=2
+set tabstop=4
set bs=2
Please sign in to comment.
Something went wrong with that request. Please try again.