From 31196c289483e094a0a327fea5e0eaf958160e42 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 16 Jan 2022 23:09:31 +0100
Subject: [PATCH] From Bullseye desktop setup, re-move Firefox plug-ins setup
 (too much of a hassle to keep updated).

---
 bullseye/setup_scripts/setup_desktop.sh | 34 ++++++++++++-------------
 bullseye/setup_scripts/setup_home.sh    |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bullseye/setup_scripts/setup_desktop.sh b/bullseye/setup_scripts/setup_desktop.sh
index c45a6e4..ff01ce2 100755
--- a/bullseye/setup_scripts/setup_desktop.sh
+++ b/bullseye/setup_scripts/setup_desktop.sh
@@ -38,23 +38,23 @@ ln -s /opt/firefox/firefox /usr/local/bin/
 update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/firefox/firefox 200
 update-alternatives --set x-www-browser /opt/firefox/firefox
 
-# Install Firefox plugins.
-# See <https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons>
-extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
-mkdir -p "${extensions_dir}"
-ublock_version="1.40.8"
-ublock_xpi="uBlock0_${ublock_version}.firefox.signed.xpi"
-url_ublock="https://github.com/gorhill/uBlock/releases/download/${ublock_version}/${ublock_xpi}"
-wget "${url_ublock}"
-name=$(unzip -p "${ublock_xpi}" manifest.json | jq -r .applications.gecko.id)
-mv "${ublock_xpi}" "${name}".xpi
-tridactyl_version="1.22.0pre6103"
-tridactyl_xpi="tridactyl_beta-${tridactyl_version}-an+fx.xpi"
-url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
-wget "${url_tridactyl}"
-name=$(unzip -p "${tridactyl_xpi}" manifest.json | jq -r .applications.gecko.id)
-mv "${tridactyl_xpi}" "${name}.xpi"
-mv *.xpi "${extensions_dir}"
+# # Install Firefox plugins.
+# # See <https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons>
+# extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
+# mkdir -p "${extensions_dir}"
+# ublock_version="1.40.8"
+# ublock_xpi="uBlock0_${ublock_version}.firefox.signed.xpi"
+# url_ublock="https://github.com/gorhill/uBlock/releases/download/${ublock_version}/${ublock_xpi}"
+# wget "${url_ublock}"
+# name=$(unzip -p "${ublock_xpi}" manifest.json | jq -r .applications.gecko.id)
+# mv "${ublock_xpi}" "${name}".xpi
+# tridactyl_version="1.22.0pre6103"
+# tridactyl_xpi="tridactyl_beta-${tridactyl_version}-an+fx.xpi"
+# url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
+# wget "${url_tridactyl}"
+# name=$(unzip -p "${tridactyl_xpi}" manifest.json | jq -r .applications.gecko.id)
+# mv "${tridactyl_xpi}" "${name}.xpi"
+# mv *.xpi "${extensions_dir}"
 
 # Set up user environments.
 secrets_dev="sdb"
diff --git a/bullseye/setup_scripts/setup_home.sh b/bullseye/setup_scripts/setup_home.sh
index ae69b0e..7471598 100755
--- a/bullseye/setup_scripts/setup_home.sh
+++ b/bullseye/setup_scripts/setup_home.sh
@@ -97,5 +97,5 @@ if [ -f "${HOME}/${authinfo_file}" ]; then
     notmuch new
 fi
 
-# Final note on how to integrate tridactyl.
-echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run, wait a little while (Tridactyl needs to walk through all commands in the .tridactylrc) and then re-start."
+# # Final note on how to integrate tridactyl.
+# echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run, wait a little while (Tridactyl needs to walk through all commands in the .tridactylrc) and then re-start."
-- 
2.30.2