From 61916319fe8f7af1d92a9b14611ed29d933039fc Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 16 Dec 2009 16:31:47 -0800 Subject: [PATCH] Various tweaks to .bashrc, .gitconfig and others --- config/.bashrc | 13 ++----------- config/.bashrc.aliases | 8 ++++++-- config/.gitconfig | 3 +++ config/.proverc | 4 ++-- config/.vimrc | 6 +++++- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/config/.bashrc b/config/.bashrc index e3bb247..0fb7365 100755 --- a/config/.bashrc +++ b/config/.bashrc @@ -1,12 +1,6 @@ # If not running interactively, don't do anything [ -z "$PS1" ] && return -export DYLD_LIBRARY_PATH=/opt/subversion/lib:/usr/local/lib:/usr/local/lib -export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib -# This is ... madness. -#export PERL5LIB="/opt/local/lib/perl5/5.10.0/darwin-2level/: -#export PERL5LIB="/opt/local/lib/perl5/site_perl/5.8.8:/Library/Perl/5.8.8" -#export PERL5LIB=/opt/local/lib/perl5/site_perl/5.10.0:/opt/local/lib/perl5/site_perl/5.8.8:/Library/Perl/5.8.8 -#export PERL5LIB=/opt/local/lib/perl5/site_perl/5.10.0:/opt/local/lib/perl5/site_perl/5.8.8 +export PATH=/opt/subversion/bin:~/bin:/usr/local/bin:/opt/local/bin:/sbin:/bin:/usr/sbin:/opt/local/sbin:/usr/bin:/usr/games:/opt/bin:/usr/local/sbin:~/bin:/usr/X11R6/bin:/opt/local/lib/postgresql83/bin:~/svn/parrot export PERL_MM_USE_DEFAULT=1 export TEST_JOBS=9 export JSLIB=~/js @@ -16,11 +10,9 @@ export HISTCONTROL=ignoreboth shopt -s checkwinsize export GIT_PS1_SHOWDIRTYSTATE=42 export GIT_PS1_SHOWSTASHSTATE=42 - export HARNESS_OPTIONS="j" #export HARNESS_TIMER=0 #export HARNESS_VERBOSE=0 - # bus error central #export MallocScribble=42 #export MallocStackLogging=42 @@ -29,7 +21,7 @@ export HARNESS_OPTIONS="j" #export MallocCheckHeapEach=100 # make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)" +#[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)" # set variable identifying the chroot you work in (used in the prompt below) if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then @@ -59,7 +51,6 @@ if [ -f /etc/bash_completion ]; then . /etc/bash_completion fi -export PATH=/opt/subversion/bin:~/bin:/usr/local/bin:/opt/local/bin:/sbin:/bin:/usr/sbin:/opt/local/sbin:/usr/bin:/usr/games:/opt/bin:/usr/local/sbin:~/bin:/usr/X11R6/bin:/opt/local/lib/postgresql83/bin/ export bgcolor=black export C1='' export C2='' diff --git a/config/.bashrc.aliases b/config/.bashrc.aliases index 986f8d5..e63fbd3 100644 --- a/config/.bashrc.aliases +++ b/config/.bashrc.aliases @@ -57,11 +57,14 @@ function grh () { git rebase -i head~$1 } -alias nqp="parrot_nqp" +alias tapir="parrot t/harness.pir t/*.t" +alias pg="psql85" alias pp0="patch -p0" alias pp1="patch -p1" alias new_plumage="make realclean; parrot_nqp Configure.nqp; make" alias test_new_plumage="new_plumage && make test" +alias nqp=~/git/nqp-rx/parrot_install/bin/nqp +alias smolder_parrot="sup && new_parrot && make smolder_test" alias cg='valgrind --dsymutil=yes --dump-instr=yes --trace-jump=yes' alias rot13="perl -pe 'y/a-zA-Z/n-za-mN-ZA-M/'" @@ -72,6 +75,7 @@ alias glg="git log --graph --pretty=oneline" alias grc="git rebase --continue" alias glp="git log -p" alias githist="git log -p" +alias gs="git status" alias undo="git reset HEAD^" alias gd="git diff --cached -a --diff-filter=ACDTMR" @@ -158,7 +162,7 @@ alias colorsvn=svn alias sdl="svn diff| colordiff|less -R" alias sup='colorsvn up' alias ssa="colorsvn status" -alias ss="svn status |grep -v '\.swp$'|grep -v '\.swo$' |grep -v '~$' |grep -v '\._'" +alias ss="svn status |grep -v ^?| grep -v '\.swp$'|grep -v '\.swo$' |grep -v '~$' |grep -v '\._'" alias ssc="svn status |grep -v '\.swp$' |grep -v '~$' |grep -v '\._' |grep '^C'" alias sa="colorsvn add" alias si="colorsvn info" diff --git a/config/.gitconfig b/config/.gitconfig index eb0ad1a..d3a8009 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -10,6 +10,8 @@ last = cat-file commit HEAD v = !git --version plog = log --pretty=format:'%C(yellow)%h%Creset %s %Cred%an%Creset %Cblue%d%Creset %Cgreen%cr%Creset %cd' --graph --all + pl = log --pretty=format:'%C(yellow)%h%Creset %s %Cred%an%Creset %Cblue%d%Creset %Cgreen%cr%Creset %cd' --graph --all + lp = log -p spread = !git push --tags origin master && git push --tags github master who = shortlog -se -- faster = repack -a -d -f --window=200 --window-memory=1g @@ -17,6 +19,7 @@ back = checkout - flog = reflog + [core] excludesfile = ~/.gitignore editor = vim diff --git a/config/.proverc b/config/.proverc index 0a2a7f9..86e16d7 100644 --- a/config/.proverc +++ b/config/.proverc @@ -1,3 +1,3 @@ ---state=hot,fast,save --j9 --fork +#--state=hot,fast,save +#-j9 --fork diff --git a/config/.vimrc b/config/.vimrc index 13f839f..9308c4b 100644 --- a/config/.vimrc +++ b/config/.vimrc @@ -1,6 +1,7 @@ let $PAGER = 'less' let $LESS = 'dQFe' set spell spelllang=en +set nospell autocmd BufNewFile,BufRead COMMIT_EDITMSG set filetype=gitcommit @@ -178,7 +179,7 @@ map ,pe :!perl -e ' "map ,t :!DEBUG=1 ./Build test --verbose 1 --test_files % \|colortest map ,tl :!DEBUG=1 ./Build test --verbose 1 --test_files % \|colortest\|less -R map ,T :!DEBUG=1 ./Build test --verbose 1 --test_files \|colortest -map ,p :!./parrot % +map ,p :!prove -v % map ,P :!pasm2pir iab slef self @@ -189,6 +190,9 @@ iab charcter character iab charcters characters iab exmaple example iab shoudl should +iab slef self +iab flaot float +iab Float Float iab seperate separate iab teh the iab Yjl Jonathan Leto