Merge branch 'master' of ssh://github.com/meineerde/dotfiles

.ackrc

@@ -0,0 +1,4 @@
+--type-add=ruby=.haml,.rake,.rsel
+--type-add=css=.scss
+
+--type-set=markup=.textile,.markdown,.md

.bashrc

@@ -212,6 +212,8 @@ alias gdiff='git diff'
 alias st='git st'
 alias log='git lg'
 alias ciam='git ci -am'
+alias got='git'
+alias goit='git'
 
 alias ss="script/server -b 127.0.0.1"
 alias sc="script/console"

.gemrc

@@ -0,0 +1 @@
+gem: --no-rdoc --no-ri

.gitignore

@@ -1,2 +1 @@
-/.vim/sessions
-.gemrc
+/.vim/sessions

Rakefile

@@ -9,7 +9,7 @@ namespace :install do
         full = File.join Dir.pwd, file
         Dir.chdir ENV["HOME"] do
           mkdir_p File.dirname(file) 
-	  sh "rm #{file}" if (File.exist? file and File.directory? full)
+          File.delete(file) if (File.exist? file and File.directory? full)
           sh "ln -sf #{full} #{file}"
         end
       end
@@ -18,7 +18,7 @@ namespace :install do
   end
 
   install :irb, ".irbrc", ".config/irb/*.rb"
-  install :dot, ".bash_profile", ".bashrc", ".gemrc", ".vimrc", ".vim", ".gitignore", ".gitconfig"
+  install :dot, *%w(.bash_profile .bashrc .gemrc .global_gitignore .gitconfig .ackrc)
   install :bin, "bin/*"
 
   desc "installs the custom texmf folder"