Skip to content

Commit

Permalink
Re-tweak for GitHub Air.
Browse files Browse the repository at this point in the history
  • Loading branch information
nuclearsandwich committed Jun 17, 2012
1 parent 73d28d0 commit 21d83c2
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "tomorrow"]
path = tomorrow
url = git://github.com/chriskempson/tomorrow-theme.git
6 changes: 3 additions & 3 deletions bash_profile
Expand Up @@ -4,7 +4,7 @@ source $HOME/.bashrc
export EDITOR='vim'
export VISUAL='vim'
export HGEDITOR=$EDITOR
eval `ssh-agent`
#eval `ssh-agent`


gemdoc() {
Expand All @@ -17,6 +17,6 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true \

export VIM_APP_DIR='/Users/steven/Applications/' # OSX
export _JAVA_AWT_WM_NONREPARENTING=1
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
[[ -s "$HOME/.nvm/nvm.sh" ]] && source "$HOME/.nvm/nvm.sh" # Load NVM into a shell.
#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
#[[ -s "$HOME/.nvm/nvm.sh" ]] && source "$HOME/.nvm/nvm.sh" # Load NVM into a shell.
if test -s "/Users/steven/.bashrc" ; then . "/Users/steven/.bashrc" ; fi
26 changes: 13 additions & 13 deletions bashrc
@@ -1,8 +1,8 @@
PATH=/usr/local/bin:$PATH:$HOME/bin
PATH=/usr/local/lib/luarocks/bin:$PATH
alias p='mpc toggle'
alias ls='ls --color=auto' # Doesn't work on Mac.
#alias ls='ls -GFbT' # Mac version of ^that^.
#alias ls='ls --color=auto' # Doesn't work on Mac.
alias ls='ls -GFbT' # Mac version of ^that^.
alias vi='vim'
#alias netcfg='sudo netcfg2'
alias w='wicd-curses'
Expand Down Expand Up @@ -36,21 +36,21 @@ export VIM_APP_DIR='/Applications'
function get_branch {
if [ -d .git ]; then
BRANCH="$(git branch | awk '/\*/ { print $2 }')@"
elif [ -d .hg ]; then
BRANCH="$(hg branch)@"
# elif [ -d .hg ]; then
# BRANCH="$(hg branch)@"
else
BRANCH=''
fi
}

if [ -s $HOME/.rvm/scripts/rvm ]; then
source $HOME/.rvm/scripts/rvm
alias gemset='rvm gemset'
fi

if [ -s $HOME/.nvm/nvm.sh ]; then
source $HOME/.nvm/nvm.sh
fi
#if [ -s $HOME/.rvm/scripts/rvm ]; then
# source $HOME/.rvm/scripts/rvm
# alias gemset='rvm gemset'
#fi
#
#if [ -s $HOME/.nvm/nvm.sh ]; then
# source $HOME/.nvm/nvm.sh
#fi


# Function from Steve Losh's article on zsh prompt customization
Expand Down Expand Up @@ -101,7 +101,7 @@ NORM=$WHITE

PROMPT_COMMAND="get_branch; $PROMT_COMMAND"

export PS1="\[$LINE\]┌─\[$BRKT\][ \[$STAT\]\$?\[$BRKT\] ][ \[$REPO\]\$(repo_char)\$(hg_ps1)\$ \[$BRKT\]][ \[$DATE\]\A \[$BRKT\]][ \[$CDIR\]\h:\${BRANCH}\W \[$BRKT\]]\n\[$LINE\]└─\[$PCHR\]> \[$NORM\]"
export PS1="\[$LINE\]┌─\[$BRKT\][ \[$STAT\]\$?\[$BRKT\] ][ \[$REPO\]\$(repo_char)\$ \[$BRKT\]][ \[$DATE\]\A \[$BRKT\]][ \[$CDIR\]\h:\${BRANCH}\W \[$BRKT\]]\n\[$LINE\]└─\[$PCHR\]> \[$NORM\]"

# ┌─[ 15:49 ][ ○!$ ][ swordfish:default@.dotfiles ]
# └─>
Expand Down
2 changes: 1 addition & 1 deletion gitconfig
@@ -1,6 +1,6 @@
[user]
email = steven@nuclearsandwich.com
name = Steven! Ragnarök
name = Steven! Ragnarök

[giggle]
main-window-maximized = false
Expand Down
1 change: 1 addition & 0 deletions hg-git
Submodule hg-git added at 036146
2 changes: 1 addition & 1 deletion hgrc
Expand Up @@ -8,7 +8,7 @@ commitsubrepos = false
hg-prompt = $HOME/.dotfiles/hg-prompt/prompt.py
color =
convert =
hg-git = /usr/lib/python2.7/site-packages/hggit
hggit =

[color]
status.modified = cyan
Expand Down
1 change: 1 addition & 0 deletions tomorrow
Submodule tomorrow added at 74ed94

0 comments on commit 21d83c2

Please sign in to comment.