9 files changed, 107 insertions, 30 deletions
diff --git a/.config/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls
index 9200d46..4146274 100644
--- a/.config/qutebrowser/bookmarks/urls
+++ b/.config/qutebrowser/bookmarks/urls
@@ -130,3 +130,7 @@ https://amazingribs.com/tested-recipes/vegetables-and-salads/simple-creamy-south
 https://amazingribs.com/tested-recipes/spice-rubs-and-pastes/meatheads-memphis-dust-rub-recipe Meathead's World Famous Memphis Dust Rub
 https://manage.buyvm.net/# Stallion
 https://www.richardphotolab.com/ Premium Film Developing, Scanning and Photo Printing | Richard Photo Lab
+https://www.tradingview.com/chart/1a1NjVtp/ AVIR 32.16 ▲ +1.87% Unnamed
+https://wandererfinancial.com/trade-talk/ Trade Talk - Wanderer Financial
+https://wandererfinancial.com/9-29-21-todays-market/ 9/29/21 Today's Market - Wanderer Financial
+https://www.summitpost.org/ Climbing, Hiking, Mountaineering : SummitPost
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index 09965e0..51f4a0b 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -21,7 +21,7 @@ c.tabs.background = True
 c.tabs.position = "top"
 
 c.content.autoplay = False
-c.editor.command = ['foot', 'nvim', '{}']
+c.editor.command = ['alacritty', 'nvim', '{}']
 
 c.url.default_page = "about:blank"
 # searches
@@ -34,33 +34,43 @@ c.url.searchengines['a'] = 'https://wiki.archlinux.org/?search={}'
 c.url.searchengines['y'] = 'https://www.youtube.com/results?search_query={}'
 c.url.searchengines['ap'] = 'https://www.archlinux.org/packages/?sort=&q={}'
 c.url.searchengines['w'] = 'https://www.google.com/search?q={}+site%3Awired.com'
-c.url.searchengines['t'] = 'https://lite.duckduckgo.com/lite/?q={}%20site%3Ahttps%3A%2F%2Fwww.elliotoracle.com%2Fblog%2F&t=fpas&ia=web'
+
 #tor
 #c.content.proxy = 'socks://localhost:9050/'
 
 # block JS out of the box:
 c.content.javascript.enabled = False
 
+# JS is okay for some sites:
 js_whitelist = [
-    "*://localhost/*",
-    "*://127.0.0.1/*",
-    "*://github.com/*",
-    "*://gitlab.com/*",
-    "*://*.youtube.com/*",
-    "*://*.luxagraf.net/*"
-    "*://translate.google.com/*",
-    "*://schoolsfirst.com/*",
+"*://localhost/*",
+"*://127.0.0.1/*",
+"https://live.luxagraf.net/*",
+"https://cloud.luxagraf.net/*",
+"https://luxagraf.net/*",
+"*://github.com/*",
+"*://gitlab.com/*",
+"*://*.youtube.com/*",
+"*://*.tastyworks.com/*",
+"*://wandererfinancial.com/*",
+"*://*.tradingview.com/*",
+"*://translate.google.com/*",
+"*://*.schoolsfirstfcu.com/*",
+"*://www.ssec.wisc.edu/*",
+"*://bumfuzzle.com/*",
+"*://pmags.com/*",
+"*://*.tastyworks.com/*",
+"https://discuss.pixls.us/*",
+"https://www.startpage.com/*",
+"https://*.schwab.com/*",
+"https://*.hyvor.com/*",
+"https://ecosophia.dreamwidth.org/*",
 ]
-private_whitelist = os.path.expanduser("~/.config/qutebrowser/private-whitelist")
-if os.path.exists(private_whitelist):
-    with open(private_whitelist) as f:
-        js_whitelist += filter(lambda l: bool(l), f.read().split("\n"))
-
 for site in js_whitelist:
     with config.pattern(site) as p:
         p.content.javascript.enabled = True
 
-# ================== Youtube Add Blocking ======================= {{{
+# ================== Youtube Ad Blocking ======================= {{{
 def filter_yt(info: interceptor.Request):
     """Block the given request if necessary."""
     url = info.request_url
@@ -82,6 +92,11 @@ config.unbind('K', mode='normal')
 config.bind('J', 'tab-prev', mode='normal')
 config.bind('K', 'tab-next', mode='normal')
 
+# pinned tab nav
+config.bind('<Ctrl+1>', 'tab-select 1', mode='normal')
+config.bind('<Ctrl+2>', 'tab-select 2', mode='normal')
+config.bind('<Ctrl+3>', 'tab-select 3', mode='normal')
+config.bind('<Ctrl+4>', 'tab-select 4', mode='normal')
 # get rid of things I always hit accidentally
 config.unbind('<Ctrl+v>')
 # however passthru mode is nice on some sites
@@ -94,13 +109,12 @@ config.unbind('<Ctrl+h>')
 config.bind (',r', 'spawn --userscript myread.py', mode='normal')
 
 #download current or hinted video
-config.bind(';y', 'spawn --userscript youtube-dl')
+config.bind(',y', 'spawn --userscript youtube-dl')
 config.bind(';yh', 'hint links --userscript youtube-dl')
 
 # watch current or hinted video
 config.bind(',yl', 'hint links spawn --detach mpv --force-window yes {hint-url}')
 config.bind(',yv', 'spawn --detach mpv --force-window yes {url}')
-config.bind(',ys', 'spawn --userscript youtube-dl')
 
 # open selected text in tab
 config.bind (',f', 'open {primary}')
@@ -471,22 +485,24 @@ c.colors.tabs.indicator.stop = solarized['orange']
 ## Background color of unselected odd tabs.
 ## Type: QtColor
 c.colors.tabs.odd.bg = solarized['base03']
-
+c.colors.tabs.pinned.odd.bg = solarized['base03']
+c.colors.tabs.pinned.even.bg = solarized['base03']
 ## Foreground color of unselected odd tabs.
 ## Type: QtColor
 c.colors.tabs.odd.fg = solarized['base1']
 
 ## Background color of selected even tabs.
 ## Type: QtColor
-c.colors.tabs.selected.even.bg = solarized['violet']
-
+c.colors.tabs.selected.even.bg = solarized['yellow']
+c.colors.tabs.pinned.selected.even.bg = solarized['yellow']
+c.colors.tabs.pinned.selected.odd.bg = solarized['yellow']
 ## Foreground color of selected even tabs.
 ## Type: QtColor
 c.colors.tabs.selected.even.fg = solarized['base2']
 
 ## Background color of selected odd tabs.
 ## Type: QtColor
-c.colors.tabs.selected.odd.bg = solarized['violet']
+c.colors.tabs.selected.odd.bg = solarized['yellow']
 
 ## Foreground color of selected odd tabs.
 ## Type: QtColor
diff --git a/.config/qutebrowser/greasemonkey/twitter-to-nitter.js b/.config/qutebrowser/greasemonkey/twitter-to-nitter.js
new file mode 100644
index 0000000..b9ccc38
--- /dev/null
+++ b/.config/qutebrowser/greasemonkey/twitter-to-nitter.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           Twitter to Nitter redirector
+// @namespace      mamg22's userscripts
+// @match          http://twitter.com/*
+// @match          https://twitter.com/*
+// @match          http://www.twitter.com/*
+// @match          https://www.twitter.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("twitter.com","nitter.net");
diff --git a/.config/qutebrowser/greasemonkey/youtube-to-invidious.js b/.config/qutebrowser/greasemonkey/youtube-to-invidious.js
new file mode 100644
index 0000000..b51c506
--- /dev/null
+++ b/.config/qutebrowser/greasemonkey/youtube-to-invidious.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           YouTube to Invidious redirector
+// @namespace      lxf userscripts
+// @match          http://youtube.com/*
+// @match          https://youtube.com/*
+// @match          http://www.youtube.com/*
+// @match          https://www.youtube.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("www.youtube.com","invidious.fdn.fr");
diff --git a/.config/qutebrowser/private-whitelist b/.config/qutebrowser/private-whitelist
deleted file mode 100644
index d2a8266..0000000
--- a/.config/qutebrowser/private-whitelist
+++ /dev/null
@@ -1,3 +0,0 @@
-*://bumfuzzle.com/*,
-*://pmags.com/*,
-*://git.luxagraf.net/*,
diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks
index bdc5e82..4b83a6f 100644
--- a/.config/qutebrowser/quickmarks
+++ b/.config/qutebrowser/quickmarks
@@ -1,15 +1,17 @@
 ad https://live.luxagraf.net/admin/
+tr https://live.luxagraf.net/trading/
+base https://wandererfinancial.com/basecamp/
 li https://live.luxagraf.net/
 lx https://luxagraf.net/
-dev http://10.97.181.153:8000/
-aw https://awstats.luxagraf.net/cgi-bin/awstats.pl?config=luxagraf.net
-stats https://stats.luxagraf.net/
-arch https://www.archlinux.org/news/
+dev http://10.87.144.224:8000/
+stats https://awstats.luxagraf.net/cgi-bin/awstats.pl?config=luxagraf.net
 wind https://earth.nullschool.net/
 weather http://www.ssec.wisc.edu/data/us_comp/large
 map https://maps.usgs.gov/padus/
 trans https://translate.google.com/
 salts https://lovelovething.com/cell-salts-easy-homeopathy/
 sch https://www.schoolsfirstfcu.org/
+tast https://trade.tastyworks.com/login/index.html
 sw http://schwab.com/
 wm https://webmail.luxagraf.net/rainloop/
+arch https://www.archlinux.org/news/
diff --git a/.config/qutebrowser/userscripts/twitter-to-nitter.js b/.config/qutebrowser/userscripts/twitter-to-nitter.js
new file mode 100644
index 0000000..b9ccc38
--- /dev/null
+++ b/.config/qutebrowser/userscripts/twitter-to-nitter.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           Twitter to Nitter redirector
+// @namespace      mamg22's userscripts
+// @match          http://twitter.com/*
+// @match          https://twitter.com/*
+// @match          http://www.twitter.com/*
+// @match          https://www.twitter.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("twitter.com","nitter.net");
diff --git a/.config/qutebrowser/userscripts/youtube-to-invidious.js b/.config/qutebrowser/userscripts/youtube-to-invidious.js
new file mode 100644
index 0000000..b51c506
--- /dev/null
+++ b/.config/qutebrowser/userscripts/youtube-to-invidious.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           YouTube to Invidious redirector
+// @namespace      lxf userscripts
+// @match          http://youtube.com/*
+// @match          https://youtube.com/*
+// @match          http://www.youtube.com/*
+// @match          https://www.youtube.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("www.youtube.com","invidious.fdn.fr");
diff --git a/.config/qutebrowser/whitelists/cookies b/.config/qutebrowser/whitelists/cookies
index 35b04c6..a60c46b 100644
--- a/.config/qutebrowser/whitelists/cookies
+++ b/.config/qutebrowser/whitelists/cookies
@@ -1 +1,15 @@
-google.com
+luxagraf.net
+live.luxagraf.net
+wandererfinancial.com
+www.wandererfinancial.com
+trade.tastyworks.com
+tradingview.com
+www.tradingview.com
+tradingview.com
+www.schwab.com
+schwab.com
+client.schwab.com
+www.schoolsfirstfcu.com
+schoolsfirstfcu.com
+talk.hyvor.com
+webmail.luxagraf.net