Permalink
Browse files

Cleaned up README, prompts, and some config

  • Loading branch information...
1 parent 35d4585 commit b3ac58adcf1c04f23e4d12d5369451423eacd925 @dflems committed Jan 12, 2013
Showing with 28 additions and 39 deletions.
  1. +12 −6 README.md
  2. +5 −2 ruby/gemrc.symlink
  3. +0 −6 zsh/config.zsh
  4. +11 −25 zsh/prompt.zsh
View
@@ -1,12 +1,17 @@
## dflems' dotfiles
-Mostly based on [holman's](http://github.com/holman) topically-organized dotfiles. They're using his bootstrapping Rakefile, but I may change that out in the future for something with little or no dependencies. There's a bunch of stuff in here that's specific to my setup (my `.gitconfig` for instance). Right now, this setup is tailored for OSX. Right now, my ZSH config and prompt relies on having [rbenv](https://github.com/sstephenson/rbenv) installed and initialized. That too may change.
+Mostly based on [holman's](http://github.com/holman) topically-organized dotfiles. They're using his bootstrapping Rakefile, but I may change that out in the future for something with little or no dependencies. There's some stuff in here that's specific to my setup (my `.gitconfig` for instance), so watch out.
-## what's it gonna do?
-* Install [Homebrew](http://mxcl.github.com/homebrew) and dependencies ([grc](http://korpus.juls.savba.sk/~garabik/software/grc.html), [coreutils](http://www.gnu.org/software/coreutils)).
+## prerequisites (osx only at the moment)
+* [XCode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) and [Command Line Tools](http://stackoverflow.com/questions/9329243#answer-9329325)
+* [Homebrew](http://mxcl.github.com/homebrew)
+* [rbenv](https://github.com/sstephenson/rbenv#installation) is optional, but recommended `brew install rbenv ruby-build`
+
+## what's this gonna do?
+* Install some Homebrew dependencies ([grc](http://korpus.juls.savba.sk/~garabik/software/grc.html), [coreutils](http://www.gnu.org/software/coreutils)).
* Symlink each `FILENAME.symlink` to `~/.FILENAME`.
* Every `*.zsh` file will get sourced.
* Autocompletion loaded from `completion.zsh` files in topic folders.
-* Source `~/.localrc` for super secret stuff that you don't want to put on the internets.
+* Use `~/.localrc` for super secret stuff that you don't want to put on the internets.
* Aliases `git` to `hub` for easier Github integration.
## install it
@@ -17,10 +22,11 @@ script/bootstrap
```
## .dotfiles of interest
-* [dotfiles.github.com](http://dotfiles.github.com): Growing list of resources (follow [@octodots](http://www.twitter.com/octodots))
+* [dotfiles.github.com](http://dotfiles.github.com): Growing list of resources (follow [@octodots](http://www.twitter.com/octodots) for the latest-and-greatest)
* [holman/dotfiles](http://github.com/holman/dotfiles): Bootstrapping, topicality, ZSH config, vim config
* [rtomayko/dotfiles](https://github.com/rtomayko/dotfiles): Some scripts (and symlinking `bitch,` to `sudo`. Genius.)
* [garybernhardt/dotfiles](https://github.com/garybernhardt/dotfiles): Git scripts and gitconfig. Great stuff. A+ would recommend.
## todo
-* Lots.
+* Script for installing common homebrew recipes
+* Clean up
View
@@ -1,7 +1,10 @@
---
:update_sources: true
-:verbose: true
+:sources:
+- http://gems.rubyforge.org/
+- http://gems.github.com
+:benchmark: false
:bulk_threshold: 1000
:backtrace: false
-:benchmark: false
+:verbose: true
gem: --no-ri --no-rdoc
View
@@ -1,9 +1,3 @@
-if [[ -n $SSH_CONNECTION ]]; then
- export PS1='%m:%3~$(git_info_for_prompt)%# '
-else
- export PS1='%3~$(git_info_for_prompt)%# '
-fi
-
export LSCOLORS="exfxcxdxbxegedabagacad"
export CLICOLOR=true
View
@@ -23,7 +23,6 @@ git_dirty() {
git_prompt_info () {
ref=$(/usr/bin/git symbolic-ref HEAD 2>/dev/null) || return
-# echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
echo "${ref#refs/heads/}"
}
@@ -45,39 +44,26 @@ rb_prompt(){
then
echo "%{$fg_bold[yellow]%}$(rbenv version | awk '{print $1}')%{$reset_color%}"
else
- echo ""
- fi
-}
-
-# This keeps the number of todos always available the right hand side of my
-# command line. I filter it to only count those tagged as "+next", so it's more
-# of a motivation to clear out the list.
-todo(){
- if (( $+commands[todo.sh] ))
- then
- num=$(echo $(todo.sh ls +next | wc -l))
- let todos=num-2
- if [ $todos != 0 ]
- then
- echo "$todos"
- else
- echo ""
- fi
- else
- echo ""
+ echo "%{$fg_bold[yellow]%}system%{$reset_color%}"
fi
}
directory_name(){
echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}"
}
-export PROMPT=$'\n$(rb_prompt) in $(directory_name) $(git_dirty)$(need_push)\n'
+set_rprompt () {
+ #export RPROMPT="%{$fg_bold[grey]%}$(whoami)@$(hostname)%{$reset_color%}"
+}
+
set_prompt () {
- export RPROMPT="%{$fg_bold[cyan]%}$(todo)%{$reset_color%}"
+ export PROMPT=$'\n$(rb_prompt) in $(directory_name) $(git_dirty)$(need_push)\n'
+ export RPROMPT="%{$fg_bold[grey]%}$(whoami)@$(hostname)%{$reset_color%}"
}
-precmd() {
+precmd () {
title "zsh" "%m" "%55<...<%~"
- set_prompt
+ #set_rprompt
}
+
+set_prompt

0 comments on commit b3ac58a

Please sign in to comment.