Permalink
Browse files

Simplify, simplify, simplify.

  • Loading branch information...
1 parent 311bfb8 commit 12135a4bd7fd25afabed5a72775e369dfeded2c2 Dean Strelau committed Mar 15, 2010
Showing with 34 additions and 61 deletions.
  1. +21 −1 bash_profile
  2. +0 −32 bashrc
  3. +6 −7 gemrc
  4. +7 −17 gitconfig
  5. +0 −4 irbrc
View
@@ -1 +1,21 @@
-if [ -f ~/.bashrc ]; then source ~/.bashrc ; fi
+export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$HOME/bin
+export HISTCONTROL=erasedups
+export HISTFILESIZE=10000
+shopt -s histappend
+
+export EDITOR="vim"
+export VISUAL="vim"
+
+export PS1="\[\033[0;32m\][\W\$(__git_ps1 '\[\033[0;33m\] %s')\[\033[0;32m\]]\[\033[0m\] "
+
+export GREP_OPTIONS='--color=auto'
+export GREP_COLOR='4;31'
+
+if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases ; fi
+if [ -s ~/.z.sh ] ; then source ~/.z.sh ; fi
+if [ -f /usr/local/etc/git-completion.bash ]; then
+ source /usr/local/etc/git-completion.bash
+fi
+
+# rvm-install added line:
+if [[ -s /Users/dstrelau/.rvm/scripts/rvm ]] ; then source /Users/dstrelau/.rvm/scripts/rvm ; fi
View
@@ -1,32 +0,0 @@
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:$HOME/bin
-export HISTCONTROL=erasedups
-export HISTFILESIZE=10000
-shopt -s histappend
-
-export EDITOR="mvim -p --remote-tab-silent"
-export VISUAL="mvim -p --remote-tab-silent"
-
-export PS1="\[\033[0;32m\][\W\$(__git_ps1 '\[\033[0;33m\] %s')\[\033[0;32m\]]\[\033[0m\] "
-
-export GREP_OPTIONS='--color=auto'
-export GREP_COLOR='4;31'
-
-if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases ; fi
-if [ -s ~/.z.sh ] ; then source ~/.z.sh ; fi
-
-if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi
-if [ -d ~/.rvm/bin ] ; then export PATH=$PATH:~/.rvm/bin ; fi
-if [ -f /usr/local/etc/git-completion.bash ]; then
- source /usr/local/etc/git-completion.bash
-fi
-
-# -- start rip config -- #
-RIPDIR=/Users/dstrelau/.rip
-RUBYLIB="$RUBYLIB:$RIPDIR/active/lib"
-PATH="$PATH:$RIPDIR/active/bin"
-export RIPDIR RUBYLIB PATH
-# -- end rip config -- #
-
View
@@ -1,10 +1,9 @@
----
-:bulk_threshold: 1000
+---
gem: --no-ri --no-rdoc
-:verbose: true
+:backtrace: false
:benchmark: false
+:bulk_threshold: 1000
:update_sources: true
-:backtrace: false
-:sources:
-- http://gemcutter.org
-- http://gems.github.com
+:verbose: true
+:sources:
+- http://rubygems.org
View
@@ -2,10 +2,8 @@
name = Dean Strelau
email = dean@mintdigital.com
[alias]
- c = commit -v
co = checkout
- ignored = "!git ls-files --others --exclude-standard"
- pending = !git --no-pager log origin/master..master && echo
+ ignored = !git ls-files --others --ignored --exclude-standard
[core]
excludesfile = /Users/dstrelau/.gitignore
whitespace = trailing-space
@@ -14,7 +12,7 @@
authorsfile = /Users/dstrelau/.gitauthors
[merge]
log = true
- stat = true
+ stat = false
[mirror]
summary = true
[branch]
@@ -25,16 +23,8 @@
branch = auto
diff = auto
status = auto
-[color "branch"]
- current = yellow reverse
- local = yellow
- remote = green
-[color "diff"]
- meta = yellow bold
- frag = magenta bold
- old = red bold
- new = green bold
-[color "status"]
- added = yellow
- changed = green
- untracked = cyan
+[rerere]
+ enabled = true
+[help]
+ autocorrect = 10
+[github]
View
@@ -1,4 +0,0 @@
-IRB.conf[:AUTO_INDENT]=true
-
-require 'irb/completion'
-require 'pp'

0 comments on commit 12135a4

Please sign in to comment.