Permalink
Browse files

General cleanup

Removed tons of stuff that I don't use anymore or that I kept for no
reason.
  • Loading branch information...
1 parent 767be93 commit 94a2ae4dee151441cb3da6c549d9bb1f5dda7e48 Francisco J committed Sep 6, 2013
Showing with 14 additions and 143 deletions.
  1. +0 −100 Rakefile
  2. +1 −0 Thorfile
  3. +0 −2 gvimrc/vimrc
  4. +0 −12 ruby/autotest
  5. +1 −11 ruby/gemrc
  6. +1 −1 ruby/pryrc
  7. +4 −5 templates/gitconfig.erb
  8. +7 −12 zsh/zshrc
View
100 Rakefile
@@ -1,100 +0,0 @@
-require 'rake'
-require 'erb'
-
-$replace_all = false
-
-namespace :install do
- desc "Install ruby related dotfiles"
- task :ruby do
- install("ruby")
- end
-
- desc "Misc dotfiles"
- task :misc do
- install("misc")
- end
-
- desc "Install git related dotfiles"
- task :git => "generate:gitconfig" do
- install("git")
- end
-
- desc "Install bash related dotfiles"
- task :bash do
- install("bash")
- end
-
- desc "Install shell related dotfiles"
- task :shell do
- install("zsh")
-
- #install oh-my-zsh
- system %Q{rm -rf "$HOME/.oh-my-zsh"}
- system %Q{/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh}
- end
-
- desc "Install VIM related dotfiles"
- task :vim => "gvimrc" do
- system %Q{rm "$HOME/.vim"}
- system %Q{ln -s "$PWD/vim" "$HOME/.vim"}
- end
-
- task :gvimrc do
- install("gvimrc")
- end
-
-
- desc "Install all the dotfiles"
- task :all => [:ruby, :git, :shell]
-end
-
-namespace :generate do
- desc "Generates the gitconfig file"
- task :gitconfig do
- puts "generating gitconfig"
- File.open(File.join("git", "gitconfig"), 'w') do |new_file|
- new_file.write ERB.new(File.read(File.join("git", "gitconfig.erb"))).result(binding)
- end
- end
-end
-
-def install(folder)
- Dir["#{folder}/*"].each do |file|
- next if file =~ /.erb$/
- file_name = File.basename(file)
- if File.exist?(File.join(ENV['HOME'], ".#{file_name}"))
- if File.identical? file, File.join(ENV['HOME'], file_name)
- puts "identical ~/.#{fike}"
- elsif $replace_all
- replace_file(file)
- else
- print "overwrite ~/.#{file_name}? [ynaq] "
- case $stdin.gets.chomp
- when 'a'
- $replace_all = true
- replace_file(file)
- when 'y'
- replace_file(file)
- when 'q'
- exit
- else
- puts "skipping ~/.#{file_name}"
- end
- end
- else
- link_file(file)
- end
- end
-end
-
-def replace_file(file, use_path = false)
- new_file = use_path ? file : File.basename(file)
- system %Q{rm -rf "$HOME/.#{new_file}"}
- link_file(file, use_path)
-end
-
-def link_file(file, use_path = false)
- new_file = use_path ? file : File.basename(file)
- puts "linking ~/.#{new_file}"
- system %Q{ln -s "$PWD/#{file}" "$HOME/.#{new_file}"}
-end
View
@@ -53,6 +53,7 @@ class Dotfiles < Thor
self.bash
self.zsh
self.vim
+ self.misc
end
protected
View
@@ -238,8 +238,6 @@ function! s:PrettifyXml()
endfunction
command! PrettifyXml call <SID>PrettifyXml()
-" Abbreviations
-" iab <expr> dts strftime("%c")
hi link yardType rubyConstant
hi link yardDuckType rubyMethod
hi link yardLiteral rubyString
View
@@ -1,12 +0,0 @@
-%w{autotest/growl autotest/fsevent autotest/restart}.each do |gem|
- require gem
-end
-
-# rspec crashes when loading redgreen test using autospec
-#require 'redgreen/autotest' unless ENV['RSPEC']
-
-Autotest.add_hook :initialize do |autotest|
- %w[.git .svn .hg .DS_Store ._* vendor tmp log doc].each do |exception|
- autotest.add_exception(exception)
- end
-end
View
@@ -1,12 +1,2 @@
----
-:benchmark: false
-:verbose: true
-:sources:
-- http://gemcutter.org
-- http://gems.rubyforge.org/
-- http://gems.github.com
-- http://rubygems.org
-:bulk_threshold: 1000
-:backtrace: false
-:update_sources: true
+---
gem: --no-ri --no-rdoc
View
@@ -1,5 +1,5 @@
# vim FTW
-Pry.config.editor = "mvim"
+Pry.config.editor = "vim"
# Prompt with ruby version
Pry.prompt = [Proc.new { |obj, nest_level| "#{RUBY_VERSION} (#{obj}):#{nest_level} > " }, Proc.new { |obj, nest_level| "#{RUBY_VERSION} (#{obj}):#{nest_level} * " }]
View
@@ -1,5 +1,5 @@
[user]
- name = Francisco J.
+ name = Francisco J. Casas
email = nflamel@otrobloggeek.com
[color]
diff = auto
@@ -13,12 +13,11 @@
whitespace = fix
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset
-[github]
- user = franciscoj
- token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>
[merge]
tool = vimdiff
[alias]
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
co = checkout
- s = status
+ s = status --short
+ pa = add --path
+
View
@@ -1,15 +1,10 @@
-# Path oh-my-zsh configuration.
-
export ZSH=$HOME/.oh-my-zsh
-
-# export ZSH_THEME="candy"
export ZSH_THEME="sunrise"
export DISABLE_AUTO_TITLE=true
-export ZSH_TMUX_AUTOSTART=true
-export ZSH_TMUX_FIXTERM=false
-export ZSH_TMUX_AUTOQUIT=false
+# Set Vim as the default editor
+export EDITOR='vim'
-plugins=(git gem rails3 bundler rbenv vundle)
+plugins=(git github gem rails3 bundler rbenv vundle)
source $ZSH/oh-my-zsh.sh
@@ -22,20 +17,20 @@ fi
export RBENV_ROOT="$HOME/.rbenv"
-# Set Vim as the default editor
-export EDITOR='vim'
# Load tmuxinator
[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+
# Load NVM
[[ -s /home/flamel/.nvm/nvm.sh ]] && . /home/flamel/.nvm/nvm.sh
+
+# Aliases
alias rake="bundle exec rake"
alias migrate="rake db:migrate db:test:clone"
-alias git="hub"
alias cu='bundle exec cucumber'
alias tcu='CUCUMBER_FORMAT=pretty bundle exec cucumber'
alias cucumber='bundle exec cucumber'
alias rspec='bundle exec rspec'
-export HIPCHAT_USER="Francisco José Casas"
+export HIPCHAT_USER="Francisco J. Casas"

0 comments on commit 94a2ae4

Please sign in to comment.