diff --git a/gitconfig b/gitconfig index b7e990e..36243c9 100644 --- a/gitconfig +++ b/gitconfig @@ -3,9 +3,11 @@ email = zlorfi@gmail.com [push] default = simple +[pull] + rebase = true [core] excludesfile = /Users/michi/.gitignore - editor = macvim + editor = atom [branch] autosetuprebase = always [color] diff --git a/irbrc b/irbrc index b951b99..a7356d7 100644 --- a/irbrc +++ b/irbrc @@ -29,15 +29,6 @@ begin rescue LoadError => err warn "Couldn't load awesome_print: #{err}" end -## Enable wirble -#require 'wirble' -#Wirble.init -# -## Enable colored output -#Wirble.colorize - -# load rails stuff? -# load (File.dirname(__FILE__) + '/.railsrc') if $0 == 'irb' && ENV['RAILS_ENV'] script_console_running = ENV.include?('RAILS_ENV') && IRB.conf[:LOAD_MODULES] && IRB.conf[:LOAD_MODULES].include?('console_with_helpers') rails_running = ENV.include?('RAILS_ENV') && !(IRB.conf[:LOAD_MODULES] && IRB.conf[:LOAD_MODULES].include?('console_with_helpers')) @@ -47,4 +38,3 @@ if script_console_running require 'logger' Object.const_set(:RAILS_DEFAULT_LOGGER, Logger.new(STDOUT)) end - diff --git a/jumprc b/jumprc deleted file mode 100644 index e12127e..0000000 --- a/jumprc +++ /dev/null @@ -1,6 +0,0 @@ ---- -dl: /Users/michi/Downloads -ruby: /Users/michi/Documents/workspace_ruby -misc: /Users/michi/Documents/workspace_misc -node: /Users/michi/Documents/workspace_nodejs -root: /Users/michi diff --git a/make_my_dotfiles.sh b/make_my_dotfiles.sh index 2fddfcc..bd55a93 100755 --- a/make_my_dotfiles.sh +++ b/make_my_dotfiles.sh @@ -6,7 +6,7 @@ _homebrew=`which brew` _to_install="imagemagick mongodb postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl zsh elixir git" # Generate symlinks for files -for i in gemrc gvimrc irbrc jumprc NERDTreeBookmarks screenrc vimrc zshrc tmux.conf rspec gitconfig gitignore +for i in gemrc gitconfig gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc zshrc do if [ ! -f $HOME/.$i ] then diff --git a/mongorc.js b/mongorc.js new file mode 100644 index 0000000..e629dc2 --- /dev/null +++ b/mongorc.js @@ -0,0 +1,17 @@ +replicaset_conf = { + _id: 'demo-dev', + members: [ + { + _id: 0, + host: '127.0.0.1:27001' + }, + { + _id: 1, + host: '127.0.0.1:27002' + }, + { + _id: 2, + host: '127.0.0.1:27003' + } + ] +} diff --git a/vim/wiki/index.wiki b/vim/wiki/index.wiki index e3a0343..6c0ca45 100644 --- a/vim/wiki/index.wiki +++ b/vim/wiki/index.wiki @@ -9,6 +9,5 @@ This is my private wiki because my brain has a limited stack size. * [[generate bootable USB stick]] * [[hdiutil]] * [[pdf_decrypt]] -* [[rbenv]] * [[ssh-copy-id]] * [[vim]] diff --git a/vim/wiki/rbenv.wiki b/vim/wiki/rbenv.wiki deleted file mode 100644 index 70ee607..0000000 --- a/vim/wiki/rbenv.wiki +++ /dev/null @@ -1,9 +0,0 @@ -=rbenv= - -Ruby 1.9.3 mit einem andren Compiler installieren - -{{{class="brush: bash; ; toolbar: false;" - $ env CC=/usr/local/Cellar/gcc46/4.6.4/bin/gcc-4.6 rbenv install 1.9.3-p547 -}}} - -[ [[index|Go home]] ] diff --git a/vim/wiki_html/index.html b/vim/wiki_html/index.html index fd329f1..7c9def6 100644 --- a/vim/wiki_html/index.html +++ b/vim/wiki_html/index.html @@ -1,4 +1,4 @@ - + @@ -7,13 +7,13 @@ -

Michis Onlinebrain

+

Michis Onlinebrain

This is my private wiki because my brain has a limited stack size.

-

Linkliste

+

Linkliste