M .config/aerc/accounts.conf → .config/aerc/accounts.conf

@@ -7,4 +7,3 @@ default           = INBOX
 smtp-starttls     = yes
 from              = jes <j3s@c3f.net>
 copy-to           = Sent
-

M .shinit → .shinit

@@ -25,7 +25,10 @@ 
 # bby
 if [ "$(uname -s)" == "Darwin" ]; then
   alias cdr='cd $(find ~/git/chef/cloud-roles ~/git/chef/site-cookbooks ~/git/chef/app-cookbooks ~/git/chef/dc-roles -type d -maxdepth 1 | selecta)'
+  alias be='bundle exec'
   export CHEFUSER="jolson"
+  export CHEF_ENV="browse_test" # just for .chef/config.rb
+  export AWS_ENV="browse_test"  # just for aws cli
   export SSHUSER="jolson"
   export SSHKEY="~/.ssh/id_rsa"
   export PASH_CLIP="pbcopy"

M .vimrc → .vimrc

@@ -1,7 +1,10 @@ 
 syntax on
 colors patine
+set list lcs=tab:▸\ ,trail:·,nbsp:_
 
 " weird defaults
+set expandtab
+set autoindent
 set tabstop=4
 set shiftwidth=4
 set scrolloff=10
@@ -51,7 +54,7 @@ " markdown
 autocmd FileType markdown setlocal noruler spell spelllang=en
 
 " ruby
-autocmd FileType ruby setlocal sw=2 sts=2 expandtab
+autocmd FileType ruby setlocal ts=8 sw=2 sts=2
 
 " yaml
-autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2

M bin/MACC02VK5ECHTD7/jws-fetch → bin/MACC02VK5ECHTD7/jws-fetch

@@ -2,26 +2,26 @@ #!/bin/sh
 
 date=$(date +%s)
 for r in us-east-1 us-west-2; do
-	for p in browse cgraph; do
-		for e in test stage prod; do
-		dir="/tmp/jws/${r}/${p}/${e}"
-		mkdir -p "$dir"
-			echo "Fetching ${r}/${p}/${e}"
-			aws ec2 describe-instances --profile "${p}_${e}" --region "$r" --output text --query "Reservations[*].Instances[*].{
-			        Instance:InstanceId,
-			        Type:InstanceType,
-			        AZ:Placement.AvailabilityZone,
-			        Name:Tags[?Key==\`Name\`]|[0].Value,
-			        pubIP:PublicIpAddress,
-			        IP:PrivateIpAddress,
-			        State:State.Name,
-					VPC:VpcId
-			}" | sed "s/$/    ${p}_${e}/" > "$dir/$date" &
-			# add profile to end for easy greppin'
-			# link current for other scripts
-			ln -fs "$dir/$date" "$dir/current"
-		done
-	done
+    for p in browse cgraph; do
+        for e in test stage prod; do
+        dir="/tmp/jws/${r}/${p}/${e}"
+        mkdir -p "$dir"
+            echo "Fetching ${r}/${p}/${e}"
+            aws ec2 describe-instances --profile "${p}_${e}" --region "$r" --output text --query "Reservations[*].Instances[*].{
+                    Instance:InstanceId,
+                    Type:InstanceType,
+                    AZ:Placement.AvailabilityZone,
+                    Name:Tags[?Key==\`Name\`]|[0].Value,
+                    pubIP:PublicIpAddress,
+                    IP:PrivateIpAddress,
+                    State:State.Name,
+                    VPC:VpcId
+            }" | sed "s/$/    ${p}_${e}/" > "$dir/$date" &
+            # add profile to end for easy greppin'
+            # link current for other scripts
+            ln -fs "$dir/$date" "$dir/current"
+        done
+    done
 done
 
 wait