Permalink
Browse files

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

  • Loading branch information...
2 parents 975574f + 49d9d7e commit b1abc9ed3aed82871d42e5a1918b8e5dc44e8aad @milkypostman committed Mar 13, 2012
Showing with 20 additions and 29 deletions.
  1. +1 −0 .Rprofile
  2. +7 −0 .bashrc
  3. +0 −27 .bashrc_darwin
  4. +1 −1 .gitconfig
  5. +6 −0 .gitignore
  6. +2 −0 .zshrc
  7. +3 −1 bin/cronmelpa
View
@@ -0,0 +1 @@
+options(repos="http://streaming.stat.iastate.edu/CRAN")
View
@@ -100,6 +100,13 @@ rgrep () { find ./ -exec grep -H "$@" {} \; ; }
## enable rvm
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+## enable virtual python environment
+export VIRTUAL_ENV_DISABLE_PROMPT=1
+[[ -s $HOME/.virtualenvs/bin/activate ]] && source $HOME/.virtualenv/bin/activate
+
+## pip
+export PIP_RESPECT_VIRTUALENV=true
+
## system-based
[[ -s "$HOME/.bashrc_$(uname -s | tr '[A-Z]' '[a-z]')" ]] && \
source "$HOME/.bashrc_$(uname -s | tr '[A-Z]' '[a-z]')"
View
@@ -72,33 +72,6 @@ function ocd {
}
-## enable virtualenvwrapper
-# export VIRTUAL_ENV_DISABLE_PROMPT=1
-# export WORKON_HOME=$HOME/.virtualenvs
-# if [ -z "$VIRTUALENVWRAPPER_PYTHON" ]
-# then
-# source /usr/local/bin/virtualenvwrapper.sh
-# fi
-# workon default
-
-source $HOME/.virtualenv/bin/activate
-
-# ## pip
-# export PIP_RESPECT_VIRTUALENV=true
-# export PIP_VIRTUALENV_BASE=$WORKON_HOME
-
-# # pip bash completion start
-# _pip_completion()
-# {
-# COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
-# COMP_CWORD=$COMP_CWORD \
-# PIP_AUTO_COMPLETE=1 $1 ) )
-# }
-# complete -o default -F _pip_completion pip
-
-## use default environment
-
-
# enable bash completion
[[ -f `which brew` ]] && [[ -f `brew --prefix`/etc/bash_completion ]] && source `brew --prefix`/etc/bash_completion
View
@@ -3,7 +3,7 @@
st = status
sm = submodule
[user]
- name = Donald Ephraim Curtis
+ name = Donald Curtis
email = dcurtis@milkbox.net
[color]
branch = auto
View
@@ -105,3 +105,9 @@
/share
/.links2
/newihc
+/.offlineimap
+/avogadro
+/usr
+/.offlineimaprc
+/.Rhistory
+/.subversion/auth
View
2 .zshrc
@@ -51,6 +51,8 @@ alias ec="emacsclient"
alias ecn="emacsclient -n"
alias ecnw="emacsclient -nw"
+alias cscience="ssh cscience"
+
magit() {
runmagit="(let ((default-directory \"$(pwd)\")) \
(call-interactively 'magit-status))"
View
@@ -8,12 +8,14 @@ PATH=$HOME/.cabal/bin:$HOME/usr/bin:$HOME/bin:$PATH
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+env > $HOME/logs/user/melpaenv.log
+
## git pull
cd ${MELPADIR}
git pull origin master
## run the script
-${MELPADIR}/melpa
+${MELPADIR}/melpa 2>&1
## sync to the website
rsync -avz --delete ${MELPADIR}/packages ${MELPADIR}/html/* ${WEBROOT}/

0 comments on commit b1abc9e

Please sign in to comment.