Permalink
Browse files

Merge branch 'master' of github.com:jicksta/dotfiles

  • Loading branch information...
2 parents ce6f39c + e5506bb commit 28d1838fb48fc50ed9850903846f7a4279a0129b Jay Phillips committed Mar 27, 2012
Showing with 3 additions and 46 deletions.
  1. +0 −3 .gitmodules
  2. +0 −1 oh-my-zsh
  3. +3 −42 zshrc
View
@@ -52,9 +52,6 @@
[submodule "vim/bundle/vim-cucumber"]
path = vim/bundle/vim-cucumber
url = https://github.com/tpope/vim-cucumber.git
-[submodule "oh-my-zsh"]
- path = oh-my-zsh
- url = https://github.com/robbyrussell/oh-my-zsh.git
[submodule "vim/bundle/vim-coffee-script"]
path = vim/bundle/vim-coffee-script
url = https://github.com/kchmck/vim-coffee-script.git
Submodule oh-my-zsh deleted from a11c81
View
@@ -1,47 +1,6 @@
export DOTFILES_DIR=~/code/dotfiles
-################################################################################
-
-# Path to your oh-my-zsh configuration.
-ZSH=$DOTFILES_DIR/oh-my-zsh
-
-# Set name of the theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# Optionally, if you set this to "random", it'll load a random theme each
-# time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
-
-# Example aliases
-alias zshconfig="vim ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# Set to this to use case-sensitive completion
-# CASE_SENSITIVE="true"
-
-# Comment this out to disable weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment following line if you want to disable colors in ls
-# DISABLE_LS_COLORS="true"
-
-# Uncomment following line if you want to disable autosetting terminal title.
-DISABLE_AUTO_TITLE="true"
-
-# Uncomment following line if you want red dots to be displayed while waiting for completion
-# COMPLETION_WAITING_DOTS="true"
-
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git bundler brew gem heroku)
-
-source $ZSH/oh-my-zsh.sh
-
-# Customize to your needs...
-################################################################################
-################################################################################
-################################################################################
-################################################################################
+autoload -U colors && colors
export PS1="%{$fg[yellow]%}%~ %{$fg[white]%}%%% "
bindkey "^[[3~" delete-char
@@ -61,6 +20,8 @@ export GIT_EDITOR="vim -u NONE -c 'syntax on' -N"
source $DOTFILES_DIR/z/z.sh
+alias ls="ls -G"
+
alias b="bundle"
alias ov="cd ~/ourvirtues"

0 comments on commit 28d1838

Please sign in to comment.