Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ryanb/dotfiles
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: r00k/dotfiles
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Jul 10, 2009

  1. Copy the full SHA
    48fc516 View commit details
  2. Added vim settings

    r00k committed Jul 10, 2009
    Copy the full SHA
    70afc1e View commit details

Commits on Aug 19, 2009

  1. Copy the full SHA
    e582e36 View commit details
  2. Copy the full SHA
    02c5bf2 View commit details
  3. Repointed some aliases that referenced outdated locations. Changed th…

    …e bash prompt to something better.
    r00k committed Aug 19, 2009
    Copy the full SHA
    280a567 View commit details
  4. Trimmed down README.

    r00k committed Aug 19, 2009
    Copy the full SHA
    b3138ea View commit details
  5. Copy the full SHA
    482bbb4 View commit details
  6. Removed unused aliases.

    r00k committed Aug 19, 2009
    Copy the full SHA
    65f27ca View commit details

Commits on Aug 21, 2009

  1. Copy the full SHA
    4a63139 View commit details
  2. Copy the full SHA
    c060625 View commit details

Commits on Aug 22, 2009

  1. Added fuzzy_file_finder file so you don't need to install the gem on …

    …new boxen. Updated aliases. Updated gemrc to use github.
    r00k committed Aug 22, 2009
    Copy the full SHA
    98a1c2f View commit details

Commits on Aug 26, 2009

  1. Adding alias to colobus

    r00k committed Aug 26, 2009
    Copy the full SHA
    30ee792 View commit details
  2. Added public key

    r00k committed Aug 26, 2009
    Copy the full SHA
    dfcf892 View commit details
  3. Changed how ssh pubkey is handled. Just rming and linking the id_dsa.…

    …pub as a special case.
    r00k committed Aug 26, 2009
    Copy the full SHA
    6cc8cf9 View commit details
  4. Copy the full SHA
    a6fd97c View commit details
  5. added alias for railsdev

    r00k committed Aug 26, 2009
    Copy the full SHA
    2c823df View commit details
  6. Copy the full SHA
    f0625fa View commit details
  7. Copy the full SHA
    db06043 View commit details

Commits on Aug 31, 2009

  1. Removed lispclub alias

    r00k committed Aug 31, 2009
    Copy the full SHA
    9a886c2 View commit details
  2. Copy the full SHA
    d744614 View commit details
  3. Copy the full SHA
    96b9931 View commit details
  4. Copy the full SHA
    35778bb View commit details

Commits on Sep 3, 2009

  1. Copy the full SHA
    dbc9cab View commit details

Commits on Sep 21, 2009

  1. Copy the full SHA
    2c1ff5c View commit details

Commits on Oct 2, 2009

  1. Added code for sql output in irbrc. Added nice tweak to vim to round …

    …tabs to the nearest multiple of 2.
    r00k committed Oct 2, 2009
    Copy the full SHA
    d5a0d8a View commit details

Commits on Oct 5, 2009

  1. Copy the full SHA
    359fa78 View commit details

Commits on Oct 9, 2009

  1. Changed tags setting.

    r00k committed Oct 9, 2009
    Copy the full SHA
    53006b2 View commit details

Commits on Oct 21, 2009

  1. Added git branch to bash prompt.

    r00k committed Oct 21, 2009
    Copy the full SHA
    58b49d1 View commit details

Commits on Oct 29, 2009

  1. Changed alias. Updated gem sources. Added colors to git diff and adde…

    …d custom git alias.
    r00k committed Oct 29, 2009
    Copy the full SHA
    a9d6202 View commit details

Commits on Oct 31, 2009

  1. Copy the full SHA
    0ab4d83 View commit details

Commits on Nov 4, 2009

  1. Added keychain support.

    r00k committed Nov 4, 2009
    Copy the full SHA
    df2a66a View commit details
  2. Removed magenta from diffs.

    r00k committed Nov 4, 2009
    Copy the full SHA
    3e4f14f View commit details
  3. Copy the full SHA
    1d245bd View commit details
  4. Tweaked aliases.

    r00k committed Nov 4, 2009
    Copy the full SHA
    6296f32 View commit details

Commits on Nov 12, 2009

  1. Tweaked git setitngs.

    r00k committed Nov 12, 2009
    Copy the full SHA
    2822eb8 View commit details
  2. Copy the full SHA
    57fde6b View commit details
  3. Remove keychain.

    r00k committed Nov 12, 2009
    Copy the full SHA
    054f4a2 View commit details

Commits on Nov 17, 2009

  1. Fix alias for script/server.

    r00k committed Nov 17, 2009
    Copy the full SHA
    1b7b9a2 View commit details
  2. Tweak README.

    r00k committed Nov 17, 2009
    Copy the full SHA
    c61d474 View commit details
  3. Remove confirmation on rm *

    r00k committed Nov 17, 2009
    Copy the full SHA
    4a61086 View commit details
  4. Copy the full SHA
    96a4fcb View commit details
  5. Make screen titles work in zsh.

    r00k committed Nov 17, 2009
    Copy the full SHA
    6292ec3 View commit details
  6. Copy the full SHA
    efeef1c View commit details

Commits on Nov 18, 2009

  1. Copy the full SHA
    092c310 View commit details
  2. Copy the full SHA
    27cbcba View commit details
  3. Copy the full SHA
    68e440e View commit details
  4. Add cdgem. Yes!

    r00k committed Nov 18, 2009
    Copy the full SHA
    922f494 View commit details

Commits on Nov 23, 2009

  1. Map :Q to :q for great justice

    r00k committed Nov 23, 2009
    Copy the full SHA
    8bdc07b View commit details
  2. Copy the full SHA
    94e4e23 View commit details
  3. Added more git aliases.

    r00k committed Nov 23, 2009
    Copy the full SHA
    ab2722d View commit details
Showing with 12,222 additions and 1,836 deletions.
  1. +3 −0 .gitignore
  2. +0 −66 README
  3. +22 −0 README.md
  4. +16 −2 Rakefile
  5. +7 −0 ackrc
  6. +13 −0 agignore
  7. +0 −15 bash/aliases
  8. +0 −69 bash/completion_scripts/capistrano_completion
  9. +0 −1,265 bash/completion_scripts/git_completion
  10. +0 −24 bash/completion_scripts/project_completion
  11. +0 −69 bash/completion_scripts/rake_completion
  12. +0 −4 bash/completions
  13. +0 −2 bash/config
  14. +0 −2 bash/paths
  15. +0 −8 bash_profile
  16. +23 −0 bin/git-sweep
  17. +5 −5 gemrc
  18. +27 −4 gitconfig
  19. +7 −0 gitignore
  20. +4 −0 gvimrc
  21. +27 −0 hosts-with-timewasters-blocked.txt
  22. +1 −0 id_dsa.pub
  23. +9 −29 irbrc
  24. +4 −0 railsrc
  25. +2 −0 rdebugrc
  26. +18 −0 screenrc
  27. +66 −0 tmux.conf
  28. +1 −0 vim/.VimballRecord
  29. +19 −0 vim/UltiSnips/eruby.snippets
  30. +63 −0 vim/UltiSnips/rails.snippets
  31. +2 −0 vim/after/plugin/ruby.vim
  32. +40 −0 vim/after/plugin/snipMate.vim
  33. +142 −0 vim/autoload/pathogen.vim
  34. +435 −0 vim/autoload/snipMate.vim
  35. +191 −0 vim/colors/vividchalk.vim
  36. +1,469 −0 vim/doc/Align.txt
  37. +1,082 −0 vim/doc/NERD_tree.txt
  38. +736 −0 vim/doc/command-t.txt
  39. +5 −0 vim/doc/ft-gitcommit-plugin.txt
  40. +220 −0 vim/doc/fugitive.txt
  41. +967 −0 vim/doc/fuzzyfinder.jax
  42. +1,303 −0 vim/doc/fuzzyfinder.txt
  43. +406 −0 vim/doc/matchit.txt
  44. +1,134 −0 vim/doc/rails.txt
  45. +322 −0 vim/doc/snipMate.txt
  46. +218 −0 vim/doc/surround.txt
  47. +257 −0 vim/doc/syntastic.txt
  48. +208 −0 vim/doc/tComment.txt
  49. +676 −0 vim/doc/tags
  50. +18 −0 vim/ftdetect/git.vim
  51. +36 −0 vim/ftplugin/git.vim
  52. +67 −0 vim/ftplugin/gitcommit.vim
  53. +14 −0 vim/ftplugin/gitconfig.vim
  54. +41 −0 vim/ftplugin/gitrebase.vim
  55. +5 −0 vim/ftplugin/gitsendemail.vim
  56. +10 −0 vim/ftplugin/html_snip_helper.vim
  57. +38 −0 vim/indent/gitconfig.vim
  58. 0 vim/plugin/.gitkeep
  59. +132 −0 vim/spell/en.utf-8.add
  60. BIN vim/spell/en.utf-8.add.spl
  61. +77 −0 vim/syntax/git.vim
  62. +82 −0 vim/syntax/gitcommit.vim
  63. +37 −0 vim/syntax/gitconfig.vim
  64. +32 −0 vim/syntax/gitrebase.vim
  65. +18 −0 vim/syntax/gitsendemail.vim
  66. +19 −0 vim/syntax/snippet.vim
  67. +40 −0 vim/syntax_checkers/c.vim
  68. +40 −0 vim/syntax_checkers/cpp.vim
  69. +33 −0 vim/syntax_checkers/eruby.vim
  70. +31 −0 vim/syntax_checkers/haml.vim
  71. +30 −0 vim/syntax_checkers/haskell.vim
  72. +36 −0 vim/syntax_checkers/html.vim
  73. +26 −0 vim/syntax_checkers/javascript.vim
  74. +31 −0 vim/syntax_checkers/perl.vim
  75. +26 −0 vim/syntax_checkers/php.vim
  76. +24 −0 vim/syntax_checkers/python.vim
  77. +27 −0 vim/syntax_checkers/ruby.vim
  78. +31 −0 vim/syntax_checkers/sass.vim
  79. +36 −0 vim/syntax_checkers/sh.vim
  80. +34 −0 vim/syntax_checkers/xhtml.vim
  81. +118 −0 vim/view/~=+code=+drug-wars=+src=+elm=+Dollar.elm=
  82. +118 −0 vim/view/~=+code=+drug-wars=+src=+elm=+Inventory.elm=
  83. +118 −0 vim/view/~=+code=+drug-wars=+src=+elm=+Main.elm=
  84. +374 −0 vimrc
  85. +2 −0 zlogin
  86. +159 −27 zsh/aliases
  87. +0 −8 zsh/completion
  88. +0 −45 zsh/config
  89. +47 −0 zsh/functions
  90. +0 −2 zsh/functions/_c
  91. +0 −8 zsh/functions/_cap
  92. +0 −2 zsh/functions/_gh
  93. +0 −7 zsh/functions/_git-rm
  94. +0 −72 zsh/functions/_github
  95. +0 −2 zsh/functions/_h
  96. +0 −8 zsh/functions/_rake
  97. +0 −1 zsh/functions/c
  98. +0 −1 zsh/functions/gam
  99. +0 −1 zsh/functions/gfp
  100. +0 −48 zsh/functions/git_info_for_prompt
  101. +0 −1 zsh/functions/h
  102. +0 −1 zsh/functions/last_modified
  103. +0 −26 zsh/functions/newtab
  104. +0 −1 zsh/functions/railsapp
  105. +0 −1 zsh/functions/savepath
  106. +0 −5 zsh/functions/verbose_completion
  107. +19 −0 zsh/prompt
  108. +1 −0 zsh/z
  109. +3 −0 zshenv
  110. +42 −5 zshrc
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
vim/.netrwhist
vim/bundle
vim/doc/tags-ja
66 changes: 0 additions & 66 deletions README

This file was deleted.

22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Ben Orenstein's dot files

These are config files to set up a system the way I like it.

Vim-users will likely find useful stuff in my [vimrc](vimrc), and also my [Ruby snippets](vim/snippets/ruby.snippets).

I'm also a pretty aggressive aliaser. You might find a few you like in [zsh/aliases](zsh/aliases).

## Installation

`git clone git://github.com/r00k/dotfiles ~/.dotfiles`
`cd ~/.dotfiles`
`rake install`

Vim plugins are managed through vundle. You'll need to install vundle to get them.

`git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim`
Run :BundleInstall in vim.

## More

You can [follow me on Twitter](https://twitter.com/r00k).
18 changes: 16 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ desc "install the dot files into user's home directory"
task :install do
replace_all = false
Dir['*'].each do |file|
next if %w[Rakefile README LICENSE].include? file
next if %w[Rakefile README.rdoc LICENSE id_dsa.pub].include? file

if File.exist?(File.join(ENV['HOME'], ".#{file}"))
if replace_all
replace_file(file)
@@ -27,6 +27,20 @@ task :install do
link_file(file)
end
end

# Handle ssh pubkey on its own
puts "Linking public ssh key"
system %Q{rm "$HOME/.ssh/id_dsa.pub"}
system %Q{ln -s "$PWD/id_dsa.pub" "$HOME/.ssh/id_dsa.pub"}

# Need to do this to make vim use RVM's ruby version
puts "Moving zshenv to zshrc"
system %Q{sudo mv /etc/zshenv /etc/zshrc}

system %Q{mkdir ~/.tmp}

# Get Vundle so I can install Vim plugins
system %Q{git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim}
end

def replace_file(file)
7 changes: 7 additions & 0 deletions ackrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
--type-add
ruby=.haml,.feature,.scss,.coffee
--ignore-dir=vendor
--ignore-dir=log
--ignore-dir=tmp
--ignore-dir=doc
--ignore-dir=coverage
13 changes: 13 additions & 0 deletions agignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
log
vendor
tmp
doc
coverage
public/assets
*.sql
/.git/
*.svg
public/fonts
tags
out
node_modules
15 changes: 0 additions & 15 deletions bash/aliases

This file was deleted.

69 changes: 0 additions & 69 deletions bash/completion_scripts/capistrano_completion

This file was deleted.

Loading