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

This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-01-01 11:41:22 +01:00
commit b0586d3cd5
2 changed files with 23 additions and 22 deletions

View file

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

View file

@ -9,6 +9,28 @@ cd $DIR
git submodule init git submodule init
git submodule update --recursive 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 #rvm
curl -sSL https://get.rvm.io | bash -s stable curl -sSL https://get.rvm.io | bash -s stable
source $HOME/.rvm/scripts/rvm source $HOME/.rvm/scripts/rvm
@ -18,27 +40,6 @@ rvm install ruby
sudo ln -s /usr/bin/nodejs /usr/bin/node sudo ln -s /usr/bin/nodejs /usr/bin/node
sudo npm install -g reveal-md 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 #set solarized scheme
$DIR/gnome-terminal-colors-solarized/install.sh $DIR/gnome-terminal-colors-solarized/install.sh