From 769de961f6c8450aca2014a72e7fe196985eb588 Mon Sep 17 00:00:00 2001
From: James Blair <mail@jamesblair.net>
Date: Sun, 7 Jun 2020 21:22:49 +1200
Subject: [PATCH] Simplified ublock whitelist.

---
 firefox/ublock.txt | 3 +--
 windows-setup.org  | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/firefox/ublock.txt b/firefox/ublock.txt
index e417b08..29305e7 100644
--- a/firefox/ublock.txt
+++ b/firefox/ublock.txt
@@ -88,6 +88,5 @@
   "netWhitelist": "about-scheme\nchrome-extension-scheme\nchrome-scheme\nmoz-extension-scheme\nopera-scheme\nvivaldi-scheme\nwyciwyg-scheme",
   "dynamicFilteringString": "behind-the-scene * * noop\nbehind-the-scene * inline-script noop\nbehind-the-scene * 1p-script noop\nbehind-the-scene * 3p-script noop\nbehind-the-scene * 3p-frame noop\nbehind-the-scene * image noop\nbehind-the-scene * 3p noop",
   "urlFilteringString": "",
-  "hostnameSwitchesString": "no-large-media: behind-the-scene false\nno-remote-fonts: * true\nno-scripting: * true\nno-scripting: www.youtube.com false\nno-scripting: app.plex.tv false\nno-scripting: nextcloud.jamma.life false\nno-scripting: gitlab.jamma.life false\nno-scripting: hangouts.google.com false\nno-scripting: admin.google.com false\nno-scripting: app.slack.com false\nno-scripting: webmail.dreamhost.com false\n",
-  "userFilters": "! 9/10/2019 https://www.wish.com\nwww.wish.com##.AtfOT.AuthenticationModal__MainContent-li0874-1\nwww.wish.com##.jOGCy.AuthenticationModal__Wrapper-li0874-0.BaseModal__PlainBackDrop-sc-188teto-0\n"
+  "hostnameSwitchesString": "no-large-media: behind-the-scene false\nno-remote-fonts: * true\nno-scripting: * true\nno-scripting: www.youtube.com false\nno-scripting: app.plex.tv false\nno-scripting: *.jamma.life false\nno-scripting: accounts.google.com false\nno-scripting: hangouts.google.com false\nno-scripting: admin.google.com false\nno-scripting: app.slack.com false\nno-scripting: webmail.dreamhost.com false\n"
 }
diff --git a/windows-setup.org b/windows-setup.org
index 0b0d202..316f0c7 100644
--- a/windows-setup.org
+++ b/windows-setup.org
@@ -121,6 +121,10 @@ powershell.exe curl.exe -L -o firefox.exe https://download.mozilla.org/?product=
 firefox.exe
 #+end_src
 
+#+RESULTS: Download and run firefox installer
+#+begin_example
+#+end_example
+
 
 One of the customisations we apply is to update the color of the newtab page in firefox to match the rest of the theme we use and prevent white glare. To achieve this we use [[https://superuser.com/questions/1235975/change-firefox-new-tab-background#][usercss]].