From b1b8dcc60b916054f41f6aa5cfab12c4f96c5b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 8 Jun 2019 09:34:59 +0100
Subject: [PATCH] Add tlp, remove nikola

---
 common/up.sh | 38 ++++----------------------------------
 fedora/up.sh |  7 ++++++-
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/common/up.sh b/common/up.sh
index b5cf9bd0..93a2a9b1 100755
--- a/common/up.sh
+++ b/common/up.sh
@@ -82,6 +82,7 @@ mkdir -p ~/.cargo/
 echo "all links done"
 
 echo "adding GDB dashboard"
+rm -fr ~/.gdbinit*
 wget -P ~ git.io/.gdbinit
 
 echo "adding NVM"
@@ -213,40 +214,9 @@ if [[ -z $NO_GO ]]; then
 fi
 
 nvm use node
-npm install -g reveal-md
-npm install -g diff-so-fancy
-npm install -g cssnano
-
-if [[ -z $NOPYTHON3 ]]; then
-    set +e
-    pip3_path=`which pip3`
-    set -e
-    echo "pip3 path is $pip3_path"
-    if [[ -x "$pip3_path" ]]; then
-        echo "Choosing pip3 for pip"
-        PIP=pip3
-    else
-        echo "Choosing pip"
-        PIP=pip
-    fi
-    echo "Upgrading pip"
-    set +e
-    $SUDO $PIP install --upgrade pip setuptools
-    $SUDO $PIP install --upgrade packaging
-    set -e
-    echo "Installing Nikola"
-    $SUDO $PIP install --upgrade pygments-style-solarized ws4py watchdog webassets Nikola aiohttp
-    echo "Installing vim dependencies"
-    $SUDO $PIP install neovim
-fi
-
-if [[ -z $USER ]]; then
-    USER=`whoami`
-fi
-
-# normalize npm permissions
-mkdir -p $HOME/.npm
-$SUDO chown -R $USER $HOME/.npm
+npx npm install -g reveal-md
+npx npm install -g diff-so-fancy
+npx npm install -g cssnano
 
 echo
 echo "now go ahead and restart"
diff --git a/fedora/up.sh b/fedora/up.sh
index 3a35e962..cbffd5c3 100755
--- a/fedora/up.sh
+++ b/fedora/up.sh
@@ -16,7 +16,7 @@ if [[ -z $NOUPGRADE ]]; then
     sudo dnf -y upgrade --best --allowerasing
 fi
 
-sudo dnf -y --best --allowerasing install tmux atop zsh firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel whois curl pv gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel cmake gtk2-devel intltool gparted glances dkms kernel-devel gimp git xz util-linux-user dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp golang redhat-rpm-config pcsc-lite-devel pcsc-tools pcsc-lite yubico-piv-tool yubikey-personalization-gui xloadimage yp-tools closure-compiler optipng jpegoptim grub2 grub2-efi dracut dracut-tools openssl-devel fail2ban syncthing ansible gnome-tweaks xclip wget wireguard-dkms wireguard-tools lldb python-lldb kdbg zlib-devel libuuid-devel libattr-devel libblkid-devel libselinux-devel libudev-devel parted lsscsi ksh openssl-devel elfutils-libelf-devel libtirpc-devel kernel-devel ffmpeg-libs dnf-plugins-core restic duply docker steam clang llvm-devel clang-devel libsodium-devel chromium vim
+sudo dnf -y --best --allowerasing install tmux atop zsh firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel whois curl pv gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel cmake gtk2-devel intltool gparted glances dkms kernel-devel gimp git xz util-linux-user dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp golang redhat-rpm-config pcsc-lite-devel pcsc-tools pcsc-lite yubico-piv-tool yubikey-personalization-gui xloadimage yp-tools closure-compiler optipng jpegoptim grub2 grub2-efi dracut dracut-tools openssl-devel fail2ban syncthing ansible gnome-tweaks xclip wget wireguard-dkms wireguard-tools lldb python-lldb kdbg zlib-devel libuuid-devel libattr-devel libblkid-devel libselinux-devel libudev-devel parted lsscsi ksh openssl-devel elfutils-libelf-devel libtirpc-devel kernel-devel ffmpeg-libs dnf-plugins-core restic duply docker steam clang llvm-devel clang-devel libsodium-devel chromium vim tlp tlp-rdw
 
 sudo cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak
 sudo cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf
@@ -66,6 +66,11 @@ if [[ -z $NO_SYSTEMCTL ]]; then
     sudo systemctl restart dnf-automatic-install.timer
     sudo systemctl enable fstrim.timer
     sudo systemctl restart fstrim.timer
+    sudo systemctl enable tlp
+    sudo systemctl restart tlp
+    sudo systemctl enable tlp-sleep
+    sudo systemctl restart tlp-sleep
+    sudo systemctl mask systemd-rfkill.socket
     sudo systemctl enable --now syncthing@cyryl.service
     systemctl --user daemon-reload
     systemctl --user enable restic-backup.timer