# HG changeset patch # User Steve Losh # Date 1264781572 18000 # Node ID b6bd2bf5e4a877c79ff9cfbb5bc0455aca9dc438 # Parent ef17f73db9ec2053e7671be7f580d8409be9294d Remove old bash files, add pianobar config. diff -r ef17f73db9ec -r b6bd2bf5e4a8 .bashrc --- a/.bashrc Thu Jan 28 09:06:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -alias ls='ls -Goh ' -alias less='less -R ' -alias hl='less -R' -alias pm='python manage.py ' -alias oo='open .' -alias j='z' -alias flakes="find . -name '*.py' -print0 | xargs -0 pyflakes" -alias fab='fab -i ~/.ssh/stevelosh' -alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/stevelosh' -alias meme="curl -q --silent meme.boxofjunk.ws/moar.txt?lines=1" -alias hyde='python /Users/sjl/lib/virtualenvs/hyde-site/lib/hyde/hyde.py' -alias deact='deactivate' -alias serve_this='python -m SimpleHTTPServer' - -bind 'set completion-ignore-case on' -bind 'set show-all-if-ambiguous on' -bind 'set visible-stats on' - -shopt -s cdspell - -# Environment variables ------------------------------------------------------ -export EDITOR='vim' -export PATH="/usr/local/bin:~/lib/fmscripts:~/bin:${PATH}" -export WORKON_HOME="${HOME}/lib/virtualenvs" -export GREP_OPTIONS='--color=auto' -export HISTSIZE=1000 -export HISTFILESIZE=1000 -export HISTCONTROL=erasedups -export JPY="${HOME}/lib/j2/j.py" -export PYTHONSTARTUP="$HOME/.pythonrc.py" -export COMMAND_MODE=unix2003 -export R_LIBS="$HOME/lib/r" - -# Extra shell extensions like z and tab completion for Mercurial ------------- -source ~/lib/z/z.sh -source ~/lib/hg/bash_completion -source ~/lib/python/virtualenvwrapper/virtualenvwrapper_bashrc - -# Separate stuff ------------------------------------------------------------- -source ~/.bash/mercurial -source ~/.bash/subversion -source ~/.bash/tasks -source ~/.bash/pip -source ~/.bash/prompt - -# Homebrew ------------------------------------------------------------------- -if [ -f `brew --prefix`/etc/bash_completion ]; then - . `brew --prefix`/etc/bash_completion -fi - -# Useful functions ----------------------------------------------------------- - -wo() { - [ -f './.venv' ] && workon `cat ./.venv` -} - -# Gorilla -------------------------------------------------------------------- - -export PATH="/Users/sjl/src/gorilla/bin:$PATH" -export PYTHONPATH="/Users/sjl/src/gorilla/lib:$PYTHONPATH" - diff -r ef17f73db9ec -r b6bd2bf5e4a8 bash/mercurial --- a/bash/mercurial Thu Jan 28 09:06:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -alias mq='hg -R $(hg root)/.hg/patches' -alias tmd='hg tmd | mate' - -pull_everything() { - for repo in $( ls -1 ); do - if [[ -d $repo && -d $repo/.hg ]]; then - echo "Pulling" $repo - hg -R $repo pull -u - echo - fi - done -} - -bitb() { - local P="$(hg paths 2>/dev/null | grep 'bitbucket.org' | head -1)" - local URL="$(echo $P | sed -e's|.*\(bitbucket.org.*\)|http://\1|')" - [[ -n $URL ]] && open $URL || echo "No BitBucket path found!" -} diff -r ef17f73db9ec -r b6bd2bf5e4a8 bash/pip --- a/bash/pip Thu Jan 28 09:06:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -export PIP_VIRTUALENV_BASE=$WORKON_HOME - -PIP_BIN="`which pip`" -alias pip-sys="$PIP_BIN" - -pip() { - if [ -n "$VIRTUAL_ENV" ] - then $PIP_BIN -E "$VIRTUAL_ENV" "$@" - else echo "Not currently in a venv -- use pip-sys to work system-wide." - fi -} \ No newline at end of file diff -r ef17f73db9ec -r b6bd2bf5e4a8 bash/prompt --- a/bash/prompt Thu Jan 28 09:06:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -D=$'\[\e[0m\]' -GREY=$'\[\e[30;1;40m\]' -PINK=$'\[\e[35;40m\]' -GREEN=$'\[\e[32;40m\]' -ORANGE=$'\[\e[33;40m\]' - -hg_ps1() { - hg prompt "\ -{${D} on ${PINK}{branch}}\ -{${D} at ${ORANGE}{tags|${D}, ${ORANGE}}}\ -{${GREEN}{status|modified|unknown}}{${GREEN}{update}}\ -{${D}\npatches: {patches|pre_applied(${ORANGE})|post_applied(${D})|pre_unapplied(${GREY})|post_unapplied(${D})}}\ -" 2> /dev/null -} - -tasks_ps1() { - t | wc -l | sed -e's/ *//' -} - -render_ps1() { - echo "\n\ -${PINK}\u ${D}at ${ORANGE}\h ${D}in ${GREEN}\w$(hg_ps1)${D}\n\ -[$(tasks_ps1)] $([ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' )$ " -} - -PROMPT_COMMAND="$(echo "$PROMPT_COMMAND"|sed -e's/PS1="`render_ps1`";//g')" -PROMPT_COMMAND='PS1="`render_ps1`";'"$PROMPT_COMMAND" \ No newline at end of file diff -r ef17f73db9ec -r b6bd2bf5e4a8 bash/subversion --- a/bash/subversion Thu Jan 28 09:06:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Accomodate the updated version of Subversion -export DYLD_LIBRARY_PATH="/opt/subversion/lib:$DYLD_LIBRARY_PATH" -export PYTHONPATH="/opt/subversion/lib/svn-python:$PYTHONPATH" -export PATH="/opt/subversion/bin:$PATH" \ No newline at end of file diff -r ef17f73db9ec -r b6bd2bf5e4a8 bash/tasks --- a/bash/tasks Thu Jan 28 09:06:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -alias t='~/src/t/t.py --task-dir="~/tasks"' -alias m='~/src/t/t.py --task-dir="~/tasks" --list=music' -alias g='~/src/t/t.py --task-dir="~/tasks" --list=groceries' -alias k='~/src/t/t.py --task-dir="~/tasks" --list=books' -alias p='~/src/t/t.py --task-dir="~/tasks" --list=pack' -alias b='~/src/t/t.py --list=bugs' - -alias pa='~/src/t/t.py --task-dir="~/tasks" --list=pack-archive' -packfor() { - cp "$HOME/tasks/pack-archive" "$HOME/tasks/pack"; - touch "$HOME/tasks/.pack.done" - hg --cwd ~/tasks add 'pack' '.pack.done'; - hg -R ~/tasks commit -m 'Starting to pack.' -} diff -r ef17f73db9ec -r b6bd2bf5e4a8 config/pianobar/config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/pianobar/config Fri Jan 29 11:12:52 2010 -0500 @@ -0,0 +1,6 @@ +user = steve@stevelosh.com +history = 10 + +lastfm_user = stevelosh +lastfm_password = cold!last +lastfm_scrobble_percent = 75