Skip to content
Browse files

Changes

  • Loading branch information...
1 parent e1e787d commit 17b5a3db38895b41ded5771b81d6a6ba60d33240 @dlanger committed Jan 9, 2012
Showing with 23 additions and 20 deletions.
  1. +8 −8 .bash_aliases
  2. +1 −0 .bash_fcns
  3. +8 −10 .bashrc
  4. +5 −1 .gitconfig
  5. +1 −1 .screenrc-wave
View
16 .bash_aliases
@@ -38,14 +38,14 @@ alias runsrv='./manage.py runserver 0.0.0.0:8000'
alias runcel='./manage.py celeryd --loglevel=DEBUG'
alias runtest-mem='./manage.py jenkins -v2 --debug --traceback --settings=quick_testing_settings'
alias runtest-full='./manage.py jenkins -v2 --debug --traceback'
-alias pyc='pyclean . && ./manage.py clean_pyc'
-alias vstapp1='ssh -A waveaccounting@72.51.30.183'
-alias vstapp2='ssh -A waveaccounting@72.51.30.143'
-alias vstcel1='ssh -A waveaccounting@72.51.30.181'
-alias vstcel2='ssh -A waveaccounting@72.51.30.144'
-alias vstbeat='ssh -A waveaccounting@72.51.30.23'
-alias vstdb1='ssh -A waveaccounting@72.51.30.139'
-alias vstdb2='ssh -A waveaccounting@72.51.30.140'
+alias pyc='pyclean . && python ~/Projects/waveaccounting/waveaccounting/manage.py clean_pyc'
+alias vstapp1='ssh -A dlanger@72.51.30.183'
+alias vstapp2='ssh -A dlanger@72.51.30.143'
+alias vstcel1='ssh -A dlanger@72.51.30.181'
+alias vstcel2='ssh -A dlanger@72.51.30.144'
+alias vstbeat='ssh -A dlanger@72.51.30.23'
+alias vstdb1='ssh -A dlanger@72.51.30.139'
+alias vstdb2='ssh -A dlanger@72.51.30.140'
alias vapp1='ssh -A waveaccounting@72.51.30.171'
alias vapp2='ssh -A waveaccounting@72.51.30.172'
alias vcel1='ssh -A waveaccounting@72.51.30.174'
View
1 .bash_fcns
@@ -2,3 +2,4 @@ function mig() {
~/Projects/waveaccounting/waveaccounting/manage.py schemamigration "$@" --auto;
~/Projects/waveaccounting/waveaccounting/manage.py migrate "$@";
}
+
View
18 .bashrc
@@ -37,6 +37,14 @@ export NO_COLOR='\e[0m'
source /usr/local/bin/virtualenvwrapper.sh
+function __git_ps1 ()
+{
+ local b="$(git symbolic-ref HEAD 2>/dev/null)";
+ if [ -n "$b" ]; then
+ printf " (%s)" "${b##refs/heads/}";
+ fi
+}
+
if [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
@@ -49,16 +57,6 @@ if [ -f ~/.bash_fcns ]; then
source ~/.bash_fcns
fi
-
-# prompt from rawcky
-function __git_ps1 ()
-{
- local b="$(git symbolic-ref HEAD 2>/dev/null)";
- if [ -n "$b" ]; then
- printf " (%s)" "${b##refs/heads/}";
- fi
-}
-
PS1="\[$YELLOW\]\[$RED\][\u] \[$CYAN\]\w \[$YELLOW\]\$(__git_ps1)\[$WHITE\]\$ "
View
6 .gitconfig
@@ -2,11 +2,15 @@
name = Dan Langer
email = dan@waveaccounting.com
[push]
- default = tracking
+ default = current
+ # default = tracking
[core]
excludefile = /home/dan/dotfiles/.gitignore
excludesfile = /home/dan/dotfiles/.gitignore
[alias]
co = checkout
+ ag = "!sh -c 'git ls-files -m -o --exclude-standard | grep $1 | xargs -r git add' -"
+ ci = commit
[color]
ui = auto
+
View
2 .screenrc-wave
@@ -25,4 +25,4 @@ zombie kr
screen -t "shell"
screen -t "celery" ./manage.py celeryd --loglevel=DEBUG
screen -t "django" ./manage.py runserver 0.0.0.0:8000
-screen -t "ipython" ./manage.py shell
+screen -t "ipython" ./manage.py shell_plus

0 comments on commit 17b5a3d

Please sign in to comment.
Something went wrong with that request. Please try again.