Merge branch 'master' of github.com:cyplo/dotfiles

.config/terminator/config

@@ -16,7 +16,7 @@
     foreground_color = "#eee8d5"
     icon_bell = False
     show_titlebar = False
-    font = Inconsolata for Powerline Medium 11
+    font = Inconsolata for Powerline Medium 15
     background_color = "#002b36"
 [layouts]
   [[default]]

install_common.sh

@@ -9,6 +9,28 @@ cd $DIR
 git submodule init
 git submodule update --recursive
 
+
+#symbolic links
+ln -vfs "$DIR/.vim" ~/.
+ln -vfs "$DIR/.vimrc" ~/.
+ln -vfs "$DIR/.tmux.conf" ~/.
+rm -f "~/.zshrc"
+ln -vfs "$DIR/.zshrc" ~/.
+ln -vfs "$DIR/.oh-my-zsh" ~/.
+ln -vfs "$DIR/.Slic3r" ~/.
+ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
+ln -vfs "$DIR/tools" ~/
+
+# stuff that does not like symbolic links
+rm -f ~/.config/terminator/config
+mkdir -p "~/.config/terminator"
+ln "$DIR/.config/terminator/config" ~/.config/terminator/config
+
+#install fonts
+mkdir ~/.fonts
+cp -rv "$DIR/fonts" ~/.fonts
+fc-cache
+
 #rvm
 curl -sSL https://get.rvm.io | bash -s stable
 source $HOME/.rvm/scripts/rvm
@@ -18,27 +40,6 @@ rvm install ruby
 sudo ln -s /usr/bin/nodejs /usr/bin/node
 sudo npm install -g reveal-md
 
-#symbolic links
-ln -s "$DIR/.vim" ~/.
-ln -s "$DIR/.vimrc" ~/.
-ln -s "$DIR/.tmux.conf" ~/.
-rm -f "~/.zshrc"
-ln -s "$DIR/.zshrc" ~/.
-ln -s "$DIR/.oh-my-zsh" ~/.
-ln -s "$DIR/.Slic3r" ~/.
-ln -s "$DIR/.gitconfig.linux.private" ~/.gitconfig
-ln -s "$DIR/tools" ~/
-
-# stuff that does not like symbolic links
-rm -f ~/.config/terminator/config
-ln "$DIR/.config/terminator/config" ~/.config/terminator/config
-
-#install fonts
-mkdir ~/.fonts
-cp -rv "$DIR/fonts" ~/.fonts
-fc-cache
-
-
 #set solarized scheme
 $DIR/gnome-terminal-colors-solarized/install.sh