Skip to content

Commit

Permalink
ported and working, so far
Browse files Browse the repository at this point in the history
  • Loading branch information
atomantic committed May 24, 2012
1 parent 04518f0 commit 7fffd3a
Show file tree
Hide file tree
Showing 22 changed files with 2,141 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .crontab
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# update gems nightly
0 1 * * * gem update heroku
0 2 * * * rvm get head;rvm reload
0 3 * * * gem update -V
10 changes: 10 additions & 0 deletions .gemrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
:bulk_threshold: 1000
:benchmark: false
:sources:
- http://gems.rubyforge.org/
:update_sources: true
install: --env-shebang
:backtrace: false
:verbose: true
update: --env-shebang
223 changes: 223 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
[user]
name = Adam Eivy
email = [email protected]

[color]
# ui = true is a superset of all the more specific color options
# as documented at http://book.git-scm.com/5_customizing_git.html
# When set to always, always use colors in all git commands which are capable of colored output.
# When false, never. When set to true or auto, use colors only when the output is to the terminal.
# When more specific variables of color.* are set, they always take precedence over this setting.
# Defaults to false.
ui = auto
# diff = auto
# status = auto
# branch = 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

[gui]
fontdiff = -family Monaco -size 10 -weight normal -slant roman -underline 0 -overstrike 0

[core]
excludesfile = ~/.gitignore
quotepath = false
# line endings
# force LF durring add
autocrlf = input
# autocrlf = true # for windows to convert to CRLF on checkout and LF on add
# warn but allow line ending conversion to proceed
safecrlf = warn
# prevent crlf (then you will have to deal with the problem -- dos2unix, etc)
#safecrlf = true
editor = vim
#editor = mate -w

[alias]
br = branch -a
s = status -s -u
cl = log --stat -C -2
c = commit
co = checkout
d = diff --color-words
dh = diff HEAD
dc = diff --staged
dw = diff --word-diff
dcw = diff --color-words
dm = !git diff | mate
dv = !git diff | vim
who = shortlog -s --
ph = push
pl = pull
lp = log -p
lod = log --oneline --decorate
lg = log --graph
lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all
l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
spull = !git-svn fetch && git-svn rebase
spush = !git-svn dcommit
sync = !git pull && git push
es = !git pull --rebase && git push
lf = log --pretty=fuller
ignorechanges = update-index --assume-unchanged
noticechanges = update-index --no-assume-unchanged
gc-ap = gc --aggressive --prune
listconf = config --global --list
cam = commit -a -m
lsm = log -M --stat
hse = log --stat -5
diffall = diff HEAD
logr = log -M
logr2 = log --stat -M -2
logit = log --stat -M
scrub = !git reset --hard && git clean -fd
pub = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf
cs = status
rv = remote -v
lwr = log --stat -C
pur = pull --rebase
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
orphank = !gitk --all `git reflog | cut -c1-7`&
orphanl = !git log --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7`
k = !exec gitk --all&
testecho1 = !sh -c 'echo with slash: zero=$0 one=$1 two=$2' -
# te1 RESULT: with slash: zero=- one=A two=B
testecho2 = !sh -c 'echo without slash: zero=$0 one=$1 two=$2'
# te2 RESULT: without slash: zero=A one=B two=C
st = status
l = log --stat -C
ll = log --stat -C -3
servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack
purgeme = !git clean -fd && git reset --hard
prunenow = gc --prune=now
ri = rebase --interactive --autosquash
lol = log --pretty=oneline --graph --abbrev-commit --all
blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline
lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
ro = !git fetch origin && git reset --hard origin/master
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
pushnotes = !sh -c 'git push $1 refs/notes/*' -
fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' -
showignored = clean -ndX
showignored2 = ls-files --others --ignored --exclude-standard
showuntracked = ls-files --others --exclude-standard
rmmissing = !git rm $(git ls-files --deleted)
mergekeepoursonly = merge -s ours
redocommit = reset --soft HEAD^
listunstaged = diff --name-status
liststaged = diff --name-status --staged
listhistory = log --name-status
logn = log --oneline --name-only
busypeople = shortlog -6
busythisweek = shortlog --since=one.week.ago
configpushtracking = config push.default tracking
configpushnothing = config push.default nothing
configpushtracking = config push.default matching
configpushcurrent = config push.default current

nr = "!sh -c 'git init $0'"
echoparam1 = "!sh -c 'echo $0'"
#testshfunction = "!function gitme() { git init $1; cd $1; }; gitme"

fixup = "!sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
squash = "!sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
ccfq = "!sh -c 'git add $1 && git commit -m\"Placeholder\"' -"
logme = log --author=Matthew --stat -C
cob = checkout -b
sno = show --name-only
logsimple = log --graph --abbrev-commit --pretty=oneline --all --decorate

[apply]
whitespace = nowarn
[rerere]
enabled = 1

[difftool]
prompt = false
[difftool "myaraxis"]
cmd = araxisgitdiff ONE $LOCAL THREE FOUR $REMOTE
[diff]
# tool = araxis
tool = myaraxis

[mergetool]
prompt = false
keepBackup = false
[mergetool "myaraxis"]
cmd = araxisgitmerge $PWD/$REMOTE $PWD/$BASE $PWD/$LOCAL $PWD/$MERGED
[merge]
# tool = araxis
tool = myaraxis

[branch]
# Automatically set up pull to be --rebase
# autosetuprebase = always

[github]
# https://github.com/blog/180-local-github-config
user = atomantic

# in a few months, look into the include directive (after bug fixes)
token = MOVEALONG

[url "git://github.com/"]
insteadOf = "ghg://"
pushInsteadOf = "ghg://"
# Example: git clone ghg://ntschutta/emacs

# ghgm (github git me)
[url "git://github.com/atomantic/"]
insteadOf = "ghgm://"
pushInsteadOf = "ghgm://"
# Example: git clone ghgm://hellogitworld
[url "[email protected]:"]
insteadOf = "ghs://"
pushInsteadOf = "ghs://"
[url "[email protected]:atomantic/"]
insteadOf = "ghsm://"
pushInsteadOf = "ghsm://"
[url "https://github.com/"]
insteadOf = "ghh://"
pushInsteadOf = "ghh://"
[url "https://github.com/atomantic/"]
insteadOf = "ghhm://"
pushInsteadOf = "ghhm://"

[url "git://github.wdig.com/"]
insteadOf = "dgh://"
pushInsteadOf = "dhg://"
# Example: git clone dhg://atomantic/Portal-Application-Framework
[url "git://github.wdig.com/atomantic/"]
insteadOf = "dgha://"
pushInsteadOf = "dhga://"
# Example: git clone dhg://Portal-Application-Framework
[url "[email protected]:"]
insteadOf = "dghs://"
pushInsteadOf = "ghs://"
[url "[email protected]:atomantic/"]
insteadOf = "dghsm://"
pushInsteadOf = "ghsm://"
[url "https://github.wdig.com/"]
insteadOf = "dghh://"
pushInsteadOf = "ghh://"
[url "https://github.wdig.com/atomantic/"]
insteadOf = "dghhm://"
pushInsteadOf = "ghhm://"

[credential]
# cache creds (git help credential-cache)
helper = cache
Empty file added .gitignore
Empty file.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "z-zsh"]
path = z-zsh
url = git://github.com/sjl/z-zsh.git
[submodule "oh-my-zsh"]
path = oh-my-zsh
url = git://github.com/robbyrussell/oh-my-zsh.git
9 changes: 9 additions & 0 deletions .hgrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[ui]
username = Adam Eivy <[email protected]>
editor = vim
[hooks]
commit.autopush = hg push
precommit = ./precommit.sh
[web]
push_ssl = false
#allow_push = *
19 changes: 19 additions & 0 deletions .profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#############################################################
# Generic configuration that applies to all shells
#############################################################

# RVM Ruby Selector
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # This loads RVM into a shell session.

# RVM suggests using gcc instead of llvm (which Apple now symlinks gcc to)
export CC="/usr/bin/gcc-4.2"
export CFLAGS="-O2 -arch x86_64"
export LDFLAGS="-L/opt/local/lib"
export CPPFLAGS="-I/opt/local/include"

source ~/.shellvars
source ~/.shellfn
source ~/.shellpaths
source ~/.shellaliases
# Private/Proprietary shell aliases (not to be checked into the public repo) :)
source ~/Dropbox/Private/Boxes/osx/.shellaliases
1 change: 1 addition & 0 deletions .rvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export rvm_path="/Users/antic/.rvm"
16 changes: 16 additions & 0 deletions .screenrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Set the default window name to empty string instead of the arbitrary "bash"
shelltitle ''

# Set the window caption.
# I use caption instead of hardstatus, so it is available per split window too
# (hardstatus is only per complete screen).
caption always "%{= KW}%-Lw%{= wb}%n %t %{= KW}%+Lw %-=| ${USER}@%H | %M%d %c%{-}"
# Some decryption hints:
# %{= KW} background light black (aka dark gray) with foreground light white
# %{= wb} background dark white (ake light gray) with foreground dark blue
# %-Lw all windows before the current window.
# %n%f %t current window number, flags and title.
# %+Lw all windows after the current window.
# %-= pad remaining spaces.
# %H hostname.
# %M%d %s month and day (MmmDD) and current time (HH:MM).
75 changes: 75 additions & 0 deletions .shellaliases
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#!/bin/sh

#########################################
# Connectivity
#alias ssh.host ='ssh [email protected]'

#########################################
# Commands to run apps
alias run.clojure.repl='java -cp ${CLOJURE_HOME}/clojure.jar clojure.lang.Repl'
alias run.jlineclojure.repl='java -cp ${CLOJURE_HOME}/jline-0.9.91.jar:${CLOJURE_HOME}/clojure.jar jline.ConsoleRunner clojure.lang.Repl'
alias run.clojure.script='java -cp ${CLOJURE_HOME}/clojure.jar clojure.main'

#########################################
# Commands to change dirs
alias to.temp='cd ${MYTEMP}'
alias to.downloads='cd ${MYDOWNLOADS}'
alias to.dropbox='cd ~/Dropbox'
alias to.docs='cd ${MYDOCUMENTS}'
alias to.code='cd ${MYCODE}'
alias to.scratch='cd ${MYSCRATCH}'

alias to.devapps='cd ${MYDEVAPPS}'


#################################
# Simple Program Name Shortening
alias aq=aquamacs
alias g=git


#############################
# Utilities

# Flush the DNS on Mac
alias dnsflush='dscacheutil -flushcache'

# Copy and paste and prune the usless newline
alias pbcopynn='tr -d "\n" | pbcopy'

# Set the extended MacOS attributes on a file such that Quicklook will open it as text
alias qltext='xattr -wx com.apple.FinderInfo "54 45 58 54 21 52 63 68 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" $1'
#alias qltext2='osascript -e tell application "Finder" to set file type of ((POSIX file "$1") as alias) to "TEXT"'

# Git Scribe Commands
alias gsgp='git scribe gen pdf && open output/book.pdf'
alias gsgh='git scribe gen html && open output/book.html'

# Show network connections
# Often useful to prefix with SUDO to see more system level network usage
alias network.connections='lsof -l -i +L -R -V'
alias network.established='lsof -l -i +L -R -V | grep ESTABLISHED'
alias network.internalip="ifconfig en0 | egrep -o '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)'"
alias network.externalip='curl -s http://checkip.dyndns.org/ | sed "s/[a-zA-Z<>/ :]//g"'

# Files used, anywhere on the filesystem
alias files.usage='sudo fs_usage -e -f filesystem|grep -v CACHE_HIT|grep -v grep'
# Files being opened
alias files.open='sudo fs_usage -e -f filesystem|grep -v CACHE_HIT|grep -v grep|grep open'
# Files in use in the Users directory
alias files.usage.user='sudo fs_usage -e -f filesystem|grep -v CACHE_HIT|grep -v grep|grep Users'

# Directory listings
# LS_COLORS='no=01;37:fi=01;37:di=07;96:ln=01;36:pi=01;32:so=01;35:do=01;35:bd=01;33:cd=01;33:ex=01;31:mi=00;05;37:or=00;05;37:'
# -G Add colors to ls
# -l Long format
# -h Short size suffixes (B, K, M, G, P)
# -p Postpend slash to folders
alias ls='ls -G -h -p '
alias ll='ls -l -G -h -p '

# Restart Apache on Mac
alias apacherestart="sudo /usr/sbin/apachectl restart"

#Personal Commands
alias game.seek='txt="";for i in {1..20};do txt=$txt"$i. ";done;txt=$txt" Ready or not, here I come";say $txt'
Loading

0 comments on commit 7fffd3a

Please sign in to comment.