Commits

Mike Steder committed cfa7632

committing some more tweaks

Comments (0)

Files changed (3)

+#-*- mode: sh -*-
 # ~/.bashrc: executed by bash(1) for non-login shells.
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 # RVM: (like virtualenv for ruby?)
 [[ -s "/Users/steder/.rvm/scripts/rvm" ]] && source "/Users/steder/.rvm/scripts/rvm"  # This loads RVM into a shell session.
 
+# Ruby Brew stuff:
+export PATH=/usr/local/Cellar/ruby/1.9.3-p125/bin:${PATH}
+
 # Cassandra:
 export CASSANDRA_PATH=~/GO/Cassandra/apache-cassandra-1.0.0-rc2/bin
 export PATH="${CASSANDRA_PATH}:${PATH}"
 # EC2
 
 export AWS_KEYPAIR=steder.ci
-# bryce uses EC2_KEY in his configs
-export EC2_KEY=$EC2_PRIVATE_KEY
 
-export EC2_CERT=$(/bin/ls ~/.ec2/cert-*.pem)
-export EC2_PRIVATE_KEY=$(/bin/ls ~/.ec2/pk-*.pem)
+if [ -e ~/.ec2 ]; then
+    export EC2_CERT=$(/bin/ls ~/.ec2/cert-*.pem)
+    export EC2_PRIVATE_KEY=$(/bin/ls ~/.ec2/pk-*.pem)
+fi
 
 export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
 export EC2_AMITOOL_HOME="/usr/local/Cellar/ec2-ami-tools/1.3-45758/jars"
     . ~/.gorc
 fi
 
+if [ -e ~/.rackspace ]; then
+    echo "loading credentials from ~/.rackspace"
+    . ~/.rackspace
+fi
+
+if [ -e ~/.aws ]; then
+    echo "loading credentials from ~/.aws"
+    . ~/.aws
+fi
+
+export OPSCODE_USER="steder"
  '(aquamacs-additional-fontsets nil t)
  '(aquamacs-customization-version-id 215 t)
  '(aquamacs-tool-bar-user-customization nil t)
- '(column-number-mode nil)
- '(default-frame-alist (quote ((vertical-scroll-bars . right) (internal-border-width . 0) (cursor-type . box) (modeline . t) (fringe) (border-color . "black") (mouse-color . "black") (background-mode . light) (tool-bar-lines . 0) (menu-bar-lines . 1) (right-fringe . 11) (left-fringe . 3) (cursor-color . "red") (background-color . "white") (foreground-color . "black") (font . "-apple-Monaco-medium-normal-normal-*-12-*-*-*-m-0-iso10646-1") (fontsize . 0) (font-backend ns))))
+ '(default-frame-alist (quote ((cursor-type . box) (internal-border-width . 0) (vertical-scroll-bars . right) (modeline . t) (fringe) (border-color . "black") (mouse-color . "black") (background-mode . dark) (tool-bar-lines . 0) (menu-bar-lines . 1) (right-fringe . 16) (left-fringe . 8) (cursor-color . "#708183") (background-color . "#042028") (foreground-color . "#708183") (font . "-apple-Menlo-bold-normal-normal-*-14-*-*-*-m-0-iso10646-1") (fontsize . 0) (font-backend ns))))
  '(display-time-mode t)
  '(make-backup-files t)
  '(mu-worlds (quote (["Waterfall Glen" "wfg.mcs.anl.gov" 7777 "mikeps" "bub4202"])))
   ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
- )
+ '(python-mode-default ((t (:inherit autoface-default :height 140 :family "Menlo"))) t))
 

emacs.d/keybindings.el

 ; C-x-0: deletes current window
 
 
+
+
 ;;;  Enable clipboard functions for copy and paste:
 (setq x-select-enable-clipboard t)