From aab1171375280a6a96a305e71a1a29bc4d0db280 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Tue, 22 Feb 2022 08:40:07 +0100
Subject: [PATCH] toansible: Add firefox installation

---
 configs.yml                    |  9 ---------
 firefox_addons.txt             | 30 ------------------------------
 playbook.yml                   |  1 +
 roles/firefox/files/addons.txt | 15 +++++++++++++++
 roles/firefox/tasks/main.yml   | 18 ++++++++++++++++++
 roles/tor/tasks/main.yml       |  1 -
 6 files changed, 34 insertions(+), 40 deletions(-)
 delete mode 100644 firefox_addons.txt
 create mode 100644 roles/firefox/files/addons.txt
 create mode 100644 roles/firefox/tasks/main.yml

diff --git a/configs.yml b/configs.yml
index 31e5687..7d71e30 100644
--- a/configs.yml
+++ b/configs.yml
@@ -24,15 +24,6 @@ grub:
           sudo sed -i -E 's/^#?GRUB_DISABLE_SUBMENU.+/GRUB_DISABLE_SUBMENU=y/' /etc/default/grub &&
           sudo grub-mkconfig -o /boot/grub/grub.cfg
 
-firefox:
-    - install:
-        arch:
-            - firefox
-        debian:
-            - firefox-esr
-    - run:
-        - firefox $(sed -n '/^    http/p' firefox_addons.txt)
-
 terminator:
     - install:
         - terminator
diff --git a/firefox_addons.txt b/firefox_addons.txt
deleted file mode 100644
index 52b69d2..0000000
--- a/firefox_addons.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Cookie AutoDelete
-    https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/
-Facebook Container
-    https://addons.mozilla.org/en-US/firefox/addon/facebook-container/
-Firefox Multi-Account Containers
-    https://addons.mozilla.org/en-US/firefox/addon/multi-account-containers/
-Ghostery
-    https://addons.mozilla.org/en-US/firefox/addon/ghostery/
-GitLab Markdown Viewer
-    https://addons.mozilla.org/en-US/firefox/addon/gitlab-markdown-viewer/
-Google Container
-    https://addons.mozilla.org/en-US/firefox/addon/google-container/
-HTTPS Everywhere
-    https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/
-Privacy Badger
-    https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/
-uBlock Origin
-    https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/
-Vimium
-    https://addons.mozilla.org/en-US/firefox/addon/vimium-ff/
-Never-Consent
-    https://addons.mozilla.org/en-US/firefox/addon/never-consent/
-Privacy Redirect
-    https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/
-LocalCDN
-    https://addons.mozilla.org/en-US/firefox/addon/localcdn-fork-of-decentraleyes/
-ClearURLs
-    https://addons.mozilla.org/en-US/firefox/addon/clearurls/
-CanvasBlocker
-    https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/
diff --git a/playbook.yml b/playbook.yml
index f610cb5..ac12fa3 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -6,4 +6,5 @@
     - neovim
     - ssh-agent
     - pacman.conf
+    - firefox
     - tor
diff --git a/roles/firefox/files/addons.txt b/roles/firefox/files/addons.txt
new file mode 100644
index 0000000..acdc34b
--- /dev/null
+++ b/roles/firefox/files/addons.txt
@@ -0,0 +1,15 @@
+https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/
+https://addons.mozilla.org/en-US/firefox/addon/facebook-container/
+https://addons.mozilla.org/en-US/firefox/addon/multi-account-containers/
+https://addons.mozilla.org/en-US/firefox/addon/ghostery/
+https://addons.mozilla.org/en-US/firefox/addon/gitlab-markdown-viewer/
+https://addons.mozilla.org/en-US/firefox/addon/google-container/
+https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/
+https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/
+https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/
+https://addons.mozilla.org/en-US/firefox/addon/vimium-ff/
+https://addons.mozilla.org/en-US/firefox/addon/never-consent/
+https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/
+https://addons.mozilla.org/en-US/firefox/addon/localcdn-fork-of-decentraleyes/
+https://addons.mozilla.org/en-US/firefox/addon/clearurls/
+https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/
diff --git a/roles/firefox/tasks/main.yml b/roles/firefox/tasks/main.yml
new file mode 100644
index 0000000..b59a670
--- /dev/null
+++ b/roles/firefox/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+
+- name: Install firefox (Archlinux)
+  become: true
+  pacman:
+    name:
+      - firefox
+  when: ansible_distribution == 'Archlinux'
+
+- name: Install firefox (Debian)
+  become: true
+  apt:
+    name:
+      - firefox-esr
+  when: ansible_distribution == 'Debian'
+
+- name: Open addon pages for installation
+  command: "firefox {{ lookup('file', 'addons.txt') }}"
diff --git a/roles/tor/tasks/main.yml b/roles/tor/tasks/main.yml
index 581393f..81e2048 100644
--- a/roles/tor/tasks/main.yml
+++ b/roles/tor/tasks/main.yml
@@ -1,7 +1,6 @@
 ---
 
 - name: Install Tor (Archlinux)
-    - install:
   become: true
   pacman:
     name: