Merge remote-tracking branch 'github/master'

bin/shadow_config

@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
+use File::Spec::Functions;
 
 my @config_files = qw/
     .bashrc
@@ -8,6 +9,7 @@ my @config_files = qw/
     .dir_colors
     .gitconfig
     .irssi
+    .profile
     .perldb
     .proverc
     .psqlrc
@@ -21,7 +23,8 @@ my @config_dirs = qw/
     .ssh
     .vim
 /;
-my $dir = shift || '/home/leto/git/util';
+my $dir = shift || catdir($ENV{HOME},qw/git util/);
+
 die "$dir does not exist!" unless -e $dir;
 
 sub run {

config/.bashrc

@@ -31,14 +31,14 @@ export GIT_AUTHOR_EMAIL=jonathan@leto.net
 export GIT_AUTHOR_NAME='Jonathan "Duke" Leto'
 
 PAGER="less -FXRS"
-export TEST_JOBS=3
+export TEST_JOBS=4
 export JSLIB=~/js
 export TERMINFO=/usr/share/terminfo
 export HISTCONTROL=ignoredups
 export HISTCONTROL=ignoreboth
 shopt -s checkwinsize
-export GIT_PS1_SHOWDIRTYSTATE=42
-export GIT_PS1_SHOWSTASHSTATE=42
+export GIT_PS1_SHOWDIRTYSTATE=0
+export GIT_PS1_SHOWSTASHSTATE=0
 #export HARNESS_OPTIONS="j"
 #export HARNESS_TIMER=0
 #export HARNESS_VERBOSE=0
@@ -87,7 +87,8 @@ export C3=''
 export C4='^[[0;32m'
 export C5=''
 export C6=''
-export PS1='\[$C1\](\[$C2\]\h\[$C1\])(\[$C2\]\w\[$C1\]\[$C6\]$(__git_ps1 " %s "\[$C1\])\[$C3\]\[$C1\])\$\[$C3\] '
+#export PS1='\[$C1\](\[$C2\]\h\[$C1\])(\[$C2\]\w\[$C1\]\[$C6\]$(__git_ps1 " %s "\[$C1\])\[$C3\]\[$C1\])\$\[$C3\] '
+export PS1='\[$C1\](\[$C2\]\h\[$C1\])(\[$C2\]\w\[$C1\]\[$C6\]\[$C1\]\[$C3\]\[$C1\])\$\[$C3\] '
 export TERM=xterm-color
 export HISTFILESIZE=5000
 export HISTSIZE=5000
@@ -109,3 +110,6 @@ NVM_DIR=$HOME/git/nvm
 [ -e ~/.bash/hosts ] && source ~/.bash/hosts
 [ -e ~/.bashrc.work ] && source ~/.bashrc.work
 [ -e ~/.bashrc.local ] && source ~/.bashrc.local
+
+# perlbrew
+[ -e ~/perl5/perlbrew/etc/bashrc ] && source ~/perl5/perlbrew/etc/bashrc

config/.bashrc.aliases

@@ -99,6 +99,7 @@ alias rot13="perl -pe 'y/a-zA-Z/n-za-mN-ZA-M/'"
 alias git=hub
 alias g=git
 alias gp="git push"
+alias vgc="vi .git/config"
 
 function sha1 () {
     [ -z "$1" ] && SHA=HEAD
@@ -211,7 +212,8 @@ alias new_system_parrot="make realclean; perl Configure.pl --ccflags=-g --optimi
 alias psh="perl tools/dev/parrot_shell.pl"
 alias j=jobs
 alias f=fg
-alias ack=ack-grep
+# this should only happen on debian-ish systems
+#alias ack=ack-grep
 
 alias new_libgit2="rm -rf build; mkdir build && cd build && cmake -DBUILD_CLAY=ON .. && make -j3"
 alias install_libgit2="cd build && sudo cmake --build . --target install && cd .."

config/.profile

@@ -1,4 +1,4 @@
-source .bashrc
+source ~/.bashrc
 fortune
 
 ##