Skip to content
Browse files

updates for OS X

  • Loading branch information...
1 parent 4084ea9 commit df239ef8f96f84512ee1035dd433df6686e74d2a @mislav committed Jun 8, 2008
Showing with 14 additions and 11 deletions.
  1. +1 −1 bash_aliases
  2. 0 bash_logout
  3. +6 −2 bashrc
  4. +1 −1 gemrc
  5. +2 −2 gitconfig
  6. +1 −0 gitignore
  7. +3 −3 irbrc
  8. +0 −2 railsrc
  9. 0 vimrc
View
2 bash_aliases 100755 → 100644
@@ -61,7 +61,7 @@ function cdgem {
}
function gemdoc {
GEMDIR=`gem env gemdir`/doc
- gnome-open $GEMDIR/`ls $GEMDIR | grep $1 | sort | tail -1`/rdoc/index.html
+ open $GEMDIR/`ls $GEMDIR | grep $1 | sort | tail -1`/rdoc/index.html
}
alias qri='qri -w 106'
View
0 bash_logout 100755 → 100644
File mode changed.
View
8 bashrc 100755 → 100644
@@ -8,14 +8,18 @@
# don't put duplicate lines in the history. See bash(1) for more options
export HISTCONTROL=ignoredups
-export EDITOR=vim
+export EDITOR=mate
# set variable identifying the chroot you work in (used in the prompt below)
if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
-PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\h\[\033[00m\]:\[\e[0;31m\]\w\[\e[m\] $ '
+parse_git_branch() {
+ git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
+}
+
+PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\h\[\033[00m\]:\[\e[0;31m\]\w\[\e[m\]$(parse_git_branch) $ '
# If this is an xterm set the title to user@host:dir
case "$TERM" in
View
2 gemrc
@@ -1,9 +1,9 @@
---
+:gem: --no-ri --no-rdoc
:update_sources: true
:verbose: true
:bulk_threshold: 1000
:sources:
- http://gems.rubyforge.org
-- http://gems.github.com
:benchmark: false
:backtrace: false
View
4 gitconfig
@@ -10,7 +10,7 @@
status = auto
branch = auto
[core]
- excludesfile = /home/mislav/.gitignore
- editor = vim -c 'set ft=diff'
+ excludesfile = /Users/mislav/.gitignore
+ editor = mate -w
[mirror]
summary = true
View
1 gitignore
@@ -2,3 +2,4 @@
.svn
*.pdf
.DS_Store
+*.tmproj
View
6 irbrc
@@ -7,11 +7,11 @@ require 'rubygems'
# students.map_by_first_name
# require 'map_by_method'
# 6.to_article
-#require 'to_activerecord' # warnings with Rails 2.0.2
+# require 'to_activerecord' # warnings with Rails 2.0.2
# 'foo'.what?('FOO')
-require 'what_methods'
+# require 'what_methods'
# User.find(:all).map &its.contacts.map(&its.last_name.capitalize)
-require 'methodphitamine'
+# require 'methodphitamine'
load File.dirname(__FILE__) + '/.railsrc' if $0 == 'irb' && ENV['RAILS_ENV']
View
2 railsrc
@@ -1,5 +1,3 @@
-#!/usr/bin/ruby
-# log to
def l(stream = STDOUT)
ActiveRecord::Base.logger = Logger.new(stream)
ActiveRecord::Base.clear_active_connections!
View
0 vimrc 100755 → 100644
File mode changed.

0 comments on commit df239ef

Please sign in to comment.
Something went wrong with that request. Please try again.