Permalink
Browse files

Cleanup files and switch make structure more cleaner

  • Loading branch information...
1 parent c7396ec commit fe92c87ca747f061f519c3bad4bd5f08a3d5369b @suchasurge committed Apr 30, 2011
Showing with 43 additions and 94 deletions.
  1. +0 −1 other/gemrc → .gemrc
  2. +33 −0 .gitconfig
  3. +2 −0 .gitignore
  4. 0 other/irbrc → .irbrc
  5. 0 {other → }/.powconfig
  6. 0 {vim → }/.vim/autoload/pathogen.vim
  7. 0 {vim → }/.vim/plugin/NERD_tree.vim
  8. 0 {vim → }/.vim/plugin/peepopen.vim
  9. 0 {vim → }/.vim/snippets/cucumber.snippets
  10. 0 {vim → }/.vimrc
  11. 0 {vim → }/.vimrc.local
  12. +6 −0 {zsh/zsh → .zsh}/aliases
  13. 0 {zsh/zsh → .zsh}/completion
  14. +1 −2 {zsh/zsh → .zsh}/config
  15. 0 {zsh/zsh → .zsh}/functions/_c
  16. 0 {zsh/zsh → .zsh}/functions/_cap
  17. 0 {zsh/zsh → .zsh}/functions/_gh
  18. 0 {zsh/zsh → .zsh}/functions/_git-rm
  19. 0 {zsh/zsh → .zsh}/functions/_github
  20. 0 {zsh/zsh → .zsh}/functions/_h
  21. 0 {zsh/zsh → .zsh}/functions/_rake
  22. 0 {zsh/zsh → .zsh}/functions/gam
  23. 0 {zsh/zsh → .zsh}/functions/gfp
  24. 0 {zsh/zsh → .zsh}/functions/git_info_for_prompt
  25. 0 {zsh/zsh → .zsh}/functions/last_modified
  26. 0 {zsh/zsh → .zsh}/functions/newtab
  27. 0 {zsh/zsh → .zsh}/functions/prompt_grb_setup
  28. 0 {zsh/zsh → .zsh}/functions/prompt_wunjo_setup
  29. 0 {zsh/zsh → .zsh}/functions/savepath
  30. 0 {zsh/zsh → .zsh}/functions/verbose_completion
  31. 0 {zsh/zsh → .zsh}/functions/zgitinit
  32. 0 zsh/zshrc → .zshrc
  33. +0 −50 Rakefile
  34. BIN {vim → }/bin/fonts/MesloLGM-DZ-Bold.ttf
  35. BIN {vim → }/bin/fonts/MesloLGM-DZ-BoldItalic.ttf
  36. BIN {vim → }/bin/fonts/MesloLGM-DZ-Italic.ttf
  37. BIN {vim → }/bin/fonts/MesloLGM-DZ-Regular.ttf
  38. +1 −1 {vim → }/bin/hlink
  39. 0 {vim → }/bin/vimbundles.sh
  40. +0 −14 other/gitconfig.erb
  41. +0 −20 other/railsrc
  42. +0 −3 other/rdebugrc
  43. +0 −1 zsh/zsh/functions/c
  44. +0 −1 zsh/zsh/functions/h
  45. +0 −1 zsh/zsh/functions/railsapp
View
@@ -7,4 +7,3 @@ gem: --no-ri --no-rdoc
:sources:
- http://rubygems.org
:backtrace: false
-rdoc: --inline-source --line-numbers --format=html --template=hanna
View
@@ -0,0 +1,33 @@
+[user]
+ name = Frank
+ email = frank@heidjer.info
+[diff]
+[color]
+ ui = auto
+[alias]
+ st = status
+ ci = commit
+ co = checkout
+ di = diff
+ dc = diff --cached
+ amend = commit --amend
+ aa = add --all
+ head = !git l -1
+ h = !git head
+ r = !git l -20
+ ra = !git r --all
+ ff = merge --ff-only
+ pullff = pull --ff-only
+ l = log --graph --abbrev-commit --date=relative
+ la = !git l --all
+ div = divergence
+ gn = goodness
+ gnc = goodness --cached
+ fa = fetch --all
+
+[format]
+ pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
+
+[merge]
+ tool = vimdiff
+
View
@@ -0,0 +1,2 @@
+.DS_Store
+*/.DS_Store
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
@@ -32,5 +32,11 @@ alias grep='grep --color=auto'
# commands starting with % for pasting from web
alias %=' '
+# Ubi stuff...
+alias ubi_four='ssh root@four.ubilabs.net'
+
+# Private stuff
+alias eulando_server='ssh root@50.22.248.35'
+
# use mac_vim terminal app
alias vim='~/Developer/Cellar/macvim/7.3-57/MacVim.app/Contents/MacOS/Vim'
File renamed without changes.
@@ -4,7 +4,7 @@ else
export PS1='%3~$(git_info_for_prompt)%# '
fi
-export EDITOR='mate -w'
+export EDITOR='vim'
export PATH="/opt/local/bin:~/bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/local/git/bin:/usr/local/mysql/bin:$PATH"
export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
@@ -45,7 +45,6 @@ bindkey '^[[3~' delete-char
bindkey '^[^N' newtab
bindkey '^?' backward-delete-char
-
setopt promptsubst
autoload -U promptinit
promptinit
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
View
@@ -1,50 +0,0 @@
-require 'rake'
-require 'erb'
-
-desc "install the dot files into user's home directory"
-task :install do
- replace_all = false
- Dir['other/*', 'zsh/*'].each do |file|
- next if %w[Rakefile README.rdoc LICENSE].include? file
-
- relative_path = file.sub(/other\/|zsh\//, '')
-
- if File.exist?(File.join(ENV['HOME'], ".#{file.sub('.erb', '')}"))
- if replace_all
- replace_file(file)
- else
- print "overwrite ~/.#{relative_path.sub('.erb', '')}? [ynaq] "
- case $stdin.gets.chomp
- when 'a'
- replace_all = true
- replace_file(relative_path)
- when 'y'
- replace_file(relative_path)
- when 'q'
- exit
- else
- puts "skipping ~/.#{relative_path.sub('.erb', '')}"
- end
- end
- else
- link_file(relative_path)
- end
- end
-end
-
-def replace_file(file)
- system %Q{rm "$HOME/.#{file.sub('.erb', '')}"}
- link_file(file)
-end
-
-def link_file(file)
- if file =~ /.erb$/
- puts "generating ~/.#{file.sub('.erb', '')}"
- File.open(File.join(ENV['HOME'], ".#{file.sub('.erb', '')}"), 'w') do |new_file|
- new_file.write ERB.new(File.read("other/#{file}")).result(binding)
- end
- else
- puts "linking ~/.#{file}"
- system %Q{ln -s "$PWD/#{file}" "$HOME/.#{file}"}
- end
-end
File renamed without changes.
@@ -53,7 +53,7 @@ if ARGV.include?('-h')
end
FileUtils.mkdir_p(File.join(home,'bin'))
-(Dir.entries(root) - %w(bin . .. .git)).each do |file|
+(Dir.entries(root) - %w(bin . .. .git README TODO)).each do |file|
next if file =~ /~$/
uninstall? ? uninstall(file) : install(file)
end
File renamed without changes.
View
@@ -1,14 +0,0 @@
-[user]
- name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
- email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
-[alias]
- co = checkout
-[color]
- diff = auto
- status = auto
- branch = auto
-[core]
- excludesfile = <%= ENV['HOME'] %>/.gitignore
- editor = mate -w
-[apply]
- whitespace = nowarn
View
@@ -1,20 +0,0 @@
-#!/usr/bin/ruby
-
-# begin
-# require 'hirb' # sudo gem install cldwalker-hirb --source http://gems.github.com
-# Hirb.enable
-# rescue LoadError
-# end
-
-def change_log(stream)
- ActiveRecord::Base.logger = Logger.new(stream)
- ActiveRecord::Base.clear_active_connections!
-end
-
-def show_log
- change_log(STDOUT)
-end
-
-def hide_log
- change_log(nil)
-end
View
@@ -1,3 +0,0 @@
-eval require 'ruby-debug/completion'
-set autolist
-set autoeval
View
@@ -1 +0,0 @@
-cd ~/code/$1;
View
@@ -1 +0,0 @@
-cd ~/$1;
@@ -1 +0,0 @@
-rails $2 -m http://github.com/ryanb/rails-templates/raw/master/$1.rb $*[3,-1]

0 comments on commit fe92c87

Please sign in to comment.