From b7bb29250aba2bae811968430f8a601230f96da3 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Fri, 31 Jul 2015 20:25:32 +0200 Subject: [PATCH 01/10] Made the initial setup script re-runnable --- common/configure_fresh_system | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 1ca70faf..f2bbf255 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -48,16 +48,23 @@ rm -f ~/.config/terminator/config ln "$DIR/.config/terminator/config" ~/.config/terminator/config #install fonts -mkdir ~/.fonts +mkdir -p ~/.fonts cp -rv "$DIR/fonts" ~/.fonts fc-cache #rust +echo "installing rust" curl -sSf https://static.rust-lang.org/rustup.sh | bash -s -- -y cd "$DIR/.vim/bundle/racer/" cargo build cd "$DIR/../" -git clone https://github.com/rust-lang/rust.git +echo "getting rust sources..." +if [[ ! -d rust ]]; then + git clone https://github.com/rust-lang/rust.git +else + cd rust + git pull +fi #rvm gpg --recv-keys BF04FF17 From b4d76b68103ba4647cd0f7934522e67455445271 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 07:22:11 +0200 Subject: [PATCH 02/10] added LD_LIBRARY_PATH exports to fix rustc issues on Fedora --- .zshrc | 3 +++ common/configure_fresh_system | 1 + 2 files changed, 4 insertions(+) diff --git a/.zshrc b/.zshrc index d17e17cb..456c9d6a 100644 --- a/.zshrc +++ b/.zshrc @@ -54,3 +54,6 @@ export RUST_SRC_PATH=$HOME/dev/rust/src export EDITOR="vim" export KEYTIMEOUT=1 +#temporary fix for rustc [https://github.com/rust-lang/rust-installer/issues/30], for Fedora only +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + diff --git a/common/configure_fresh_system b/common/configure_fresh_system index f2bbf255..efca32b4 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -55,6 +55,7 @@ fc-cache #rust echo "installing rust" curl -sSf https://static.rust-lang.org/rustup.sh | bash -s -- -y +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib cd "$DIR/.vim/bundle/racer/" cargo build cd "$DIR/../" From debbd6150afb57f7c4fb08802221bb508357b7df Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 07:43:12 +0200 Subject: [PATCH 03/10] remove todoman dependency, as the git server hosting is unreliable --- common/configure_fresh_system | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index efca32b4..be0f146c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -34,8 +34,6 @@ ln -vfs "$DIR/.conky" ~/. ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig mkdir -p ~/.config/autostart/ ln -vfs "$DIR/.config/autostart/conky.desktop" ~/.config/autostart/ -mkdir -p ~/.config/todoman/ -ln -vfs "$DIR/.config/todoman/todoman.conf" ~/.config/todoman/ mkdir -p ~/.config/vdirsyncer/ ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/ @@ -77,9 +75,7 @@ rvm install ruby sudo ln -vfs /usr/bin/nodejs /usr/bin/node sudo npm install -g reveal-md -# TODOs + sync -echo "installing todoman" -cd "$DIR/common/todoman/" +# vdir syncer sudo python3 setup.py install echo "installing vdirsyncer" sudo pip install vdirsyncer From 14915130e068df66bf9328fb4cdc7112c29844b6 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 07:44:51 +0200 Subject: [PATCH 04/10] removed git submodule for todoman, as its git server is unreliable --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 739bcd23..20885b12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,9 +50,6 @@ [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] path = .oh-my-zsh-plugins/zsh-syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule "common/todoman"] - path = common/todoman - url = https://git.barrera.io/hobarrera/todoman.git [submodule ".vim/bundle/rust.vim"] path = .vim/bundle/rust.vim url = https://github.com/rust-lang/rust.vim.git From 5624959e8516b3d63e6dbb803425b5ab7446976c Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 07:47:50 +0200 Subject: [PATCH 05/10] removed todoman subdirectory, as removing todoman as a whole --- common/todoman | 1 - 1 file changed, 1 deletion(-) delete mode 160000 common/todoman diff --git a/common/todoman b/common/todoman deleted file mode 160000 index a7c327be..00000000 --- a/common/todoman +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7c327be6f84c3585028a48b46743ce94afaf5ef From fac6ef387cb787f3a1b8236d567845c25665b66c Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 08:05:20 +0200 Subject: [PATCH 06/10] removing todoman's setup line from the common config script --- common/configure_fresh_system | 1 - 1 file changed, 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index be0f146c..5c795cc2 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -76,7 +76,6 @@ sudo ln -vfs /usr/bin/nodejs /usr/bin/node sudo npm install -g reveal-md # vdir syncer -sudo python3 setup.py install echo "installing vdirsyncer" sudo pip install vdirsyncer From b29e2f55bbd1d824531133f0372a67c32d5f7aff Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 08:19:58 +0200 Subject: [PATCH 07/10] add newer RVM key as well --- common/configure_fresh_system | 1 + 1 file changed, 1 insertion(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 5c795cc2..0f756447 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -67,6 +67,7 @@ fi #rvm gpg --recv-keys BF04FF17 +gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://get.rvm.io | bash -s stable source $HOME/.rvm/scripts/rvm rvm install ruby From 84eb29faaec18a2d23cacb4c3a094fa8b8ed3471 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 09:20:19 +0200 Subject: [PATCH 08/10] link nodejs as node only when necessary --- common/configure_fresh_system | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 0f756447..41ef3f25 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -37,6 +37,12 @@ ln -vfs "$DIR/.config/autostart/conky.desktop" ~/.config/autostart/ mkdir -p ~/.config/vdirsyncer/ ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/ +# symlink 'nodejs' as node on some systems +# will replace symlink if it exists, but won't replace regular file +if [[ ! -f /usr/bin/node ]]; then + sudo ln -vfs /usr/bin/nodejs /usr/bin/node +fi + # tools ln -vfs "$DIR/tools" ~/ @@ -73,7 +79,6 @@ source $HOME/.rvm/scripts/rvm rvm install ruby # talks: reveal-md -sudo ln -vfs /usr/bin/nodejs /usr/bin/node sudo npm install -g reveal-md # vdir syncer From d6cc6d43ff10c17602451d10803d8d3565439cc2 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 20:17:56 +0200 Subject: [PATCH 09/10] Fedora: explicitely enable Tor --- fedora/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index c68b745d..5f55e2d7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -7,6 +7,9 @@ sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonf sudo dnf -y install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors vlc freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager sudo dnf -y groupinstall "C Development Tools and Libraries" +sudo systemctl enable tor +sudo systemctl start tor + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" DIR="$DIR" $DIR/common/configure_fresh_system From fddb8fb486f1269b816081d8fc9cbed7ec7c61d3 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 1 Aug 2015 21:05:20 +0200 Subject: [PATCH 10/10] yum -> dnf , enabled bumblebeed service --- fedora/install_optimus | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fedora/install_optimus b/fedora/install_optimus index 062694ba..78585c9b 100755 --- a/fedora/install_optimus +++ b/fedora/install_optimus @@ -1,9 +1,12 @@ #!/bin/bash -sudo yum install -y libbsd-devel libbsd glibc-devel libX11-devel help2man autoconf git tar glib2 glib2-devel kernel-devel kernel-headers automake gcc gtk2-devel -sudo yum install -y VirtualGL VirtualGL.i686 -sudo yum install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee/fedora21/noarch/bumblebee-release-1.2-1.noarch.rpm -sudo yum install -y bbswitch bumblebee -sudo yum install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee-nonfree/fedora21/noarch/bumblebee-nonfree-release-1.2-1.noarch.rpm -sudo yum install -y bumblebee-nvidia -sudo yum install -y primus primus.i686 +FEDORA_VERSION=`rpm -E %fedora` +sudo dnf install -y libbsd-devel libbsd glibc-devel libX11-devel help2man autoconf git tar glib2 glib2-devel kernel-devel kernel-headers automake gcc gtk2-devel +sudo dnf install -y VirtualGL VirtualGL.i686 +sudo dnf install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee/fedora$FEDORA_VERSION/noarch/bumblebee-release-1.2-1.noarch.rpm +sudo dnf install -y bbswitch bumblebee +sudo dnf install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee-nonfree/fedora$FEDORA_VERSION/noarch/bumblebee-nonfree-release-1.2-1.noarch.rpm +sudo dnf install -y bumblebee-nvidia +sudo dnf install -y primus primus.i686 +sudo systemctl enable bumblebeed.service +sudo systemctl start bumblebeed.service