From 2056351fc68aaf7183b26020e94b8f71b8b4a19a Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 13 Dec 2014 08:43:46 +0100 Subject: [PATCH 01/14] oh-my-zsh upgrade --- .oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oh-my-zsh b/.oh-my-zsh index 0222e774..141c2e59 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 0222e774978232c03795b0e858d105aba6ed8123 +Subproject commit 141c2e593401f245a9f9bb0799ada8bf14b677d7 From e20321a244fec62c63575d33857ce7b7822f1d33 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Thu, 25 Dec 2014 17:17:42 +0100 Subject: [PATCH 02/14] common install script: make the most heavy installs last, to allow for other software to be used already. Embiggen the font in the termonator console. --- .config/terminator/config | 2 +- install_common.sh | 43 ++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.config/terminator/config b/.config/terminator/config index 6d7bafdf..d5a0f5fa 100644 --- a/.config/terminator/config +++ b/.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]] diff --git a/install_common.sh b/install_common.sh index 5433c7c2..a64c1ae6 100755 --- a/install_common.sh +++ b/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 From 2e1bb7b5f8cda2e50b97aa73e1f50f3b56a22d82 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Thu, 1 Jan 2015 11:41:14 +0100 Subject: [PATCH 03/14] oh-my-zsh upgrade --- .oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oh-my-zsh b/.oh-my-zsh index 141c2e59..175b4a80 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 141c2e593401f245a9f9bb0799ada8bf14b677d7 +Subproject commit 175b4a807383530aa75145b5b6fdedb3ce1f11f2 From a3f38d11dde4b31d8aeb395c2a1ec17f5e5fb67e Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Thu, 1 Jan 2015 14:11:44 +0100 Subject: [PATCH 04/14] ltspice launch script added --- tools/ltspice | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 tools/ltspice diff --git a/tools/ltspice b/tools/ltspice new file mode 100755 index 00000000..d9bce79d --- /dev/null +++ b/tools/ltspice @@ -0,0 +1,3 @@ +#!/bin/sh +wine /home/cyryl/.wine/drive_c/Program\ Files\ \(x86\)/LTC/LTspiceIV/scad3.exe + From 36be418638718b6aa11ff4c552a2dcd21258096a Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 15:42:17 +0100 Subject: [PATCH 05/14] terminator as default terminal emulator udner ubuntu --- install_common.sh | 13 ++----------- install_ubuntu.sh | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/install_common.sh b/install_common.sh index a64c1ae6..f3be1f26 100755 --- a/install_common.sh +++ b/install_common.sh @@ -22,8 +22,8 @@ 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 -mkdir -p "~/.config/terminator" ln "$DIR/.config/terminator/config" ~/.config/terminator/config #install fonts @@ -32,6 +32,7 @@ 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 @@ -40,16 +41,6 @@ rvm install ruby sudo ln -s /usr/bin/nodejs /usr/bin/node sudo npm install -g reveal-md -#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 - echo echo "now go ahead and restart Gnome session" diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 5436099a..c10f5148 100755 --- a/install_ubuntu.sh +++ b/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 install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 3f4ee0d8461223cafe1e150becc97533fac373ac Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 16:28:58 +0100 Subject: [PATCH 06/14] gsmartcontrol utility added --- install_ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ubuntu.sh b/install_ubuntu.sh index c10f5148..522c5094 100755 --- a/install_ubuntu.sh +++ b/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 terminator +sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 4bba6e844887834511da9e3ab37aedc370265a1a Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 16:34:10 +0100 Subject: [PATCH 07/14] pip added to the default install --- install_ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 522c5094..03e48169 100755 --- a/install_ubuntu.sh +++ b/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 terminator gsmartcontrol +sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 666a883c4f1a279d3b328a5bb323afe410cf8c11 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 17:14:24 +0100 Subject: [PATCH 08/14] gnome terminal not used anymore, removing dependencies --- .gitmodules | 3 --- gnome-terminal-colors-solarized | 1 - 2 files changed, 4 deletions(-) delete mode 160000 gnome-terminal-colors-solarized diff --git a/.gitmodules b/.gitmodules index abad11a9..e38fbe39 100644 --- a/.gitmodules +++ b/.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 diff --git a/gnome-terminal-colors-solarized b/gnome-terminal-colors-solarized deleted file mode 160000 index ceab3f6b..00000000 --- a/gnome-terminal-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ceab3f6bd7ba6f03f51e1f9f512b8f74df327356 From 2798d4a6cd179df59a2b06e86dd6c71035ec873c Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 17:42:37 +0100 Subject: [PATCH 09/14] intel/nvidia optimus support for ubuntu --- install_optimus.sh | 6 ++++++ install_ubuntu.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 install_optimus.sh diff --git a/install_optimus.sh b/install_optimus.sh new file mode 100755 index 00000000..7c6fbb74 --- /dev/null +++ b/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 + + diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 03e48169..7d8ecb70 100755 --- a/install_ubuntu.sh +++ b/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 terminator gsmartcontrol python-pip +sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 35d18688359290987d2bd2d42fbd529caba87ba2 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 17:53:33 +0100 Subject: [PATCH 10/14] add aptitude to the default set of tools on ubuntu --- install_ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 7d8ecb70..d2d3b0df 100755 --- a/install_ubuntu.sh +++ b/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 terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra +sudo apt-get install 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 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 69ef2cb93e5dc9b83ac66ba1092fd0243c5ae6c3 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 18:15:47 +0100 Subject: [PATCH 11/14] 7zip added to the default ubuntu installation --- install_ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ubuntu.sh b/install_ubuntu.sh index d2d3b0df..4e3279cc 100755 --- a/install_ubuntu.sh +++ b/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 terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude +sudo apt-get install 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 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 2099afe62624ffbfc15de52053a9aed3932d7675 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 22:11:25 +0100 Subject: [PATCH 12/14] script for enabling hibernation in ubuntu --- ubuntu/com.ubuntu.enable-hibernate.pkla | 9 +++++++++ ubuntu/enable_hibernation | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 ubuntu/com.ubuntu.enable-hibernate.pkla create mode 100755 ubuntu/enable_hibernation diff --git a/ubuntu/com.ubuntu.enable-hibernate.pkla b/ubuntu/com.ubuntu.enable-hibernate.pkla new file mode 100644 index 00000000..a50e4cdf --- /dev/null +++ b/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 diff --git a/ubuntu/enable_hibernation b/ubuntu/enable_hibernation new file mode 100755 index 00000000..3fff2dea --- /dev/null +++ b/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" + From 368b42533f93d3a0284939e2262874703f74e347 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 3 Jan 2015 23:36:05 +0100 Subject: [PATCH 13/14] no asking for confirmation while upgrading ubuntu, dist-upgrade used, as we're using apt, not aptitude in the early stages, fix for shell changer --- install_common.sh | 4 ++-- install_ubuntu.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install_common.sh b/install_common.sh index f3be1f26..a4f1a706 100755 --- a/install_common.sh +++ b/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,7 +10,6 @@ cd $DIR git submodule init git submodule update --recursive - #symbolic links ln -vfs "$DIR/.vim" ~/. ln -vfs "$DIR/.vimrc" ~/. diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 4e3279cc..9c491ecc 100755 --- a/install_ubuntu.sh +++ b/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 terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar +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 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh From 87d88180179559dfbee9c9474a3a30f4007b713a Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sun, 4 Jan 2015 10:52:55 +0100 Subject: [PATCH 14/14] thunderbird added to the default ubuntu installation --- install_ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 9c491ecc..adde69da 100755 --- a/install_ubuntu.sh +++ b/install_ubuntu.sh @@ -1,7 +1,7 @@ #!/bin/bash sudo apt-get update 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 +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