Skip to content

Commit

Permalink
Use oh-my-zsh (and other updates)
Browse files Browse the repository at this point in the history
  • Loading branch information
rdeshpande committed May 17, 2012
1 parent 4a1ec5c commit a9c32e1
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 209 deletions.
3 changes: 3 additions & 0 deletions install.sh
Expand Up @@ -43,3 +43,6 @@ for name in *; do
fi
fi
done

curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh
ln -s ~/wallet/zsh/rohan.zsh ~/.oh-my-zsh/custom
10 changes: 0 additions & 10 deletions irbrc
Expand Up @@ -23,16 +23,6 @@ ANSI[:MAGENTA] = "\e[35m"
ANSI[:CYAN] = "\e[36m"
ANSI[:WHITE] = "\e[37m"

# Build a simple colorful IRB prompt
IRB.conf[:PROMPT][:SIMPLE_COLOR] = {
:PROMPT_I => "#{ANSI[:BLUE]}>>#{ANSI[:RESET]} ",
:PROMPT_N => "#{ANSI[:BLUE]}>>#{ANSI[:RESET]} ",
:PROMPT_C => "#{ANSI[:RED]}?>#{ANSI[:RESET]} ",
:PROMPT_S => "#{ANSI[:YELLOW]}?>#{ANSI[:RESET]} ",
:RETURN => "#{ANSI[:GREEN]}=>#{ANSI[:RESET]} %s\n",
:AUTO_INDENT => true }
IRB.conf[:PROMPT_MODE] = :SIMPLE

# Loading extensions of the console. This is wrapped
# because some might not be included in your Gemfile
# and errors will be raised
Expand Down
6 changes: 0 additions & 6 deletions irssi/config
Expand Up @@ -2,12 +2,6 @@

chatnets = { freenode = { type = "IRC"; }; };

channels = (
{ name = "ruby-lang"; chatnet = "freenode"; autojoin = "Yes"; },
{ name = "rubyonrails"; chatnet = "freenode"; autojoin = "Yes"; },
{ name = "sdruby"; chatnet = "freenode"; autojoin = "Yes"; }
);

aliases = {
J = "join";
WJOIN = "join -window";
Expand Down
1 change: 1 addition & 0 deletions vim/update_bundles.rb
Expand Up @@ -5,6 +5,7 @@
"https://github.com/sickill/vim-pasta.git",
"https://github.com/kien/ctrlp.vim.git",
"git://github.com/tpope/vim-haml.git",
"https://github.com/bbommarito/vim-slim.git",
"https://github.com/groenewege/vim-less",
"git://github.com/kchmck/vim-coffee-script.git",
"git://github.com/Raimondi/delimitMate",
Expand Down
5 changes: 3 additions & 2 deletions vim/vimrc
Expand Up @@ -17,7 +17,7 @@ filetype plugin indent on " Automatically detect file types.
" Gui Configuration
if has("gui_running")
set number
set guifont=Monaco:h12
set guifont=Menlo:h12
set background=dark
colorscheme BusyBee
set guioptions=egmrLt
Expand Down Expand Up @@ -83,4 +83,5 @@ autocmd FileType scss set iskeyword=@,48-57,_,-,?,!,192-255
map <leader>rv :source ~/.vimrc<CR>
" Kill whitespace
autocmd BufWritePre *.rb,*.yml,*.js,*.json,*.css,*.less,*.sass,*.html,*.xml,*.erb,*.haml,*.feature :%s/\s\+$//e
"autocmd BufWritePre *.rb,*.yml,*.js,*.json,*.css,*.less,*.sass,*.html,*.xml,*.erb,*.haml,*.feature :%s/\s\+$//e
let g:ragtag_global_maps = 1
92 changes: 0 additions & 92 deletions zsh/cmd-highlight.zsh

This file was deleted.

51 changes: 51 additions & 0 deletions zsh/rohan.zsh
@@ -0,0 +1,51 @@
KEYCHAIN_PATH=`which keychain`

if [ -n "$KEYCHAIN_PATH" ]
then
$KEYCHAIN_PATH -q id_rsa
[[ -f ~/.keychain/`hostname`-sh ]] && source ~/.keychain/`hostname`-sh
fi

# COREUTILS
source /usr/local/Cellar/coreutils/8.11/aliases

## ALIAS
alias cpd="cap production deploy"
alias pgstart="sudo -u postgres pg_ctl -D /usr/local/var/postgres start"
alias s='sudo'
alias l='gls -GHCl --color=auto'
alias ls='gls -GHCF --color=auto'
alias bi='bundle install'
alias be='bundle exec'
alias gap="git add -e"
alias gca="git commit -a -v"
alias sc="script/rails console"
alias ss="script/rails server"
alias git=hub
alias g="git"
alias gph="git push heroku"
alias hdb="heroku run rake db:migrate"
alias ..="cd .."
alias ...="cd ..."
alias socks="ssh -C2qTnN -D 8080"
alias h="heroku"

# PW MANAGER
PW_PATH="~/.pw.yml"
alias pw="gpg ~/.pw.yml.gpg && cat ~/.pw.yml && rm -f ~/.pw.yml"
alias pwe="gpg ~/.pw.yml.gpg && rm ~/.pw.yml.gpg && vi ~/.pw.yml; gpg -c ~/.pw.yml && rm -f ~/.pw.yml"

# SETTINGS
export EDITOR='vim'
export GPGKEY=01EFDA0D
export GREP_OPTIONS='--color=auto'
export LC_CTYPE=en_US.UTF-8
bindkey -e

# Work related stuff
[[ -s "$HOME/.zsh/work.zsh" ]] && source "$HOME/.zsh/work.zsh"

. ~/bin/z
function precmd () {
z --add "$(pwd -P)"
}
98 changes: 0 additions & 98 deletions zsh/zshrc

This file was deleted.

1 change: 0 additions & 1 deletion zshrc

This file was deleted.

0 comments on commit a9c32e1

Please sign in to comment.