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]]

.gitmodules

@@ -29,9 +29,6 @@
 [submodule ".oh-my-zsh"]
 	path = .oh-my-zsh
 	url = git://github.com/robbyrussell/oh-my-zsh.git
-[submodule "gnome-terminal-colors-solarized"]
-	path = gnome-terminal-colors-solarized
-	url = https://github.com/sigurdga/gnome-terminal-colors-solarized
 [submodule ".vim/bundle/nerdtree"]
 	path = .vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree

.oh-my-zsh

@@ -1 +1 @@
-Subproject commit 43aa3783f8a5606e0f884a43d51daf36553af1e4
+Subproject commit 175b4a807383530aa75145b5b6fdedb3ce1f11f2

gnome-terminal-colors-solarized

@@ -1 +0,0 @@
-Subproject commit ceab3f6bd7ba6f03f51e1f9f512b8f74df327356

install_common.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #zsh
-sudo chsh -s `which zsh` $USER 
+sudo true
+chsh -s `which zsh` $USER 
 
 #submodules
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -9,27 +10,19 @@ cd $DIR
 git submodule init
 git submodule update --recursive
 
-#rvm
-curl -sSL https://get.rvm.io | bash -s stable
-source $HOME/.rvm/scripts/rvm
-rvm install ruby
-
-# talks: reveal-md
-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" ~/.
+ln -vfs "$DIR/.vim" ~/.
+ln -vfs "$DIR/.vimrc" ~/.
+ln -vfs "$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" ~/
+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
+mkdir -vp ~/.config/terminator
 rm -f ~/.config/terminator/config
 ln "$DIR/.config/terminator/config" ~/.config/terminator/config
 
@@ -38,16 +31,15 @@ mkdir ~/.fonts
 cp -rv "$DIR/fonts" ~/.fonts
 fc-cache
 
+#rvm
+gpg --recv-keys BF04FF17
+curl -sSL https://get.rvm.io | bash -s stable
+source $HOME/.rvm/scripts/rvm
+rvm install ruby
 
-#set solarized scheme
-$DIR/gnome-terminal-colors-solarized/install.sh
-
-#setting colors to solarized should result in the default proile with the following id set
-#TODO: choose the profile dynamically
-dconf write /org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9/font "'Inconsolata for Powerline Medium 18'"
-dconf write /org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9/login-shell true
-dconf write /org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9/audible-bell false
-dconf write /org/gnome/terminal/legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9/use-system-font false
+# talks: reveal-md
+sudo ln -s /usr/bin/nodejs /usr/bin/node
+sudo npm install -g reveal-md
 
 echo
 echo "now go ahead and restart Gnome session"

install_optimus.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+sudo aptitude install -y bumblebee
+sudo aptitude install -y nvidia-331-updates
+sudo aptitude install -y bumblebee-nvidia
+
+

install_ubuntu.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 sudo apt-get update
-sudo apt-get full-upgrade
-sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm
+sudo apt-get dist-upgrade -y
+sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar thunderbird
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 $DIR/install_common.sh

tools/ltspice

@@ -0,0 +1,3 @@
+#!/bin/sh
+wine /home/cyryl/.wine/drive_c/Program\ Files\ \(x86\)/LTC/LTspiceIV/scad3.exe
+

ubuntu/com.ubuntu.enable-hibernate.pkla

@@ -0,0 +1,9 @@
+[Re-enable hibernate by default in upower]
+Identity=unix-user:*
+Action=org.freedesktop.upower.hibernate
+ResultActive=yes
+
+[Re-enable hibernate by default in logind]
+Identity=unix-user:*
+Action=org.freedesktop.login1.hibernate
+ResultActive=yes

ubuntu/enable_hibernation

@@ -0,0 +1,4 @@
+#!/bin/sh
+sudo cp -v com.ubuntu.enable-hibernate.pkla /var/lib/polkit-1/localauthority/50-local.d/
+echo "Don't forget to install Hibernate Status Button"
+