From bb84fb6d057de634464eee5e2c05de0bc97da420 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Fri, 3 Jan 2025 17:00:31 -0500
Subject: [PATCH] fish: more arista stuff, qute: more adblock lists

---
 bin/config.fish        | 48 +++++++++++++++++++++++-------------------
 qutebrowser/adblock.py | 21 ++++++++++--------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/bin/config.fish b/bin/config.fish
index 23e001c..8c81bf3 100755
--- a/bin/config.fish
+++ b/bin/config.fish
@@ -128,28 +128,32 @@ a tldr 'curl -s https://raw.githubusercontent.com/tldr-pages/tldr/main/pages/{co
 a history_find 'history -p (string sub -s 2 $argv[1]) | head -n1;:'
 a history_last 'history -n1;:'
 
-a amk 'a ws make -p (basename (git root || pwd))'
-a assh 'arista-ssh login -p google'
-a bump 'gb commit -a --amend --no-edit'
-a copen 'code -r'
-a dt 'a dt'
-a dut 'dt gd | head -n1 | cut -d/ -f3'
-a freshen 'sudo swi freshen /images/EOS.swi'
-a gb 'a git'
-a lake 'nvim (curl -L dashboard/get_tests.py?id=$argv | jq -r .tests[0].logUrl).gz;:'
-a lint 'a git lint'
-a lunch 'gb launch --schedule build --testing full'
-a oc 'gnmi -addr (dut):6030 -username admin get / | tail -n+2'
-a pb 'curl -F c=@- pb/'
-a pydt 'dt pyshell'
-a reagent 'echo "edut.restartAgent(\'$argv\')" | pydt;:'
-a revdiff 'curl -L reviewboard/r/$argv/diff/raw'
-a revfiles 'revdiff $argv | cut -f1 | sed -n "s|+++ |/|p";:'
-a san 'dt sa -p eos-trunk'
-a startoc 'dt ssh run "en ; conf ; management api gnmi ; transport grpc default"'
-a rebase 'gb update --sync --rebase'
-a san 'dt sa -p eos-trunk'
-a tcam 'echo "edut.setTcamProfile(\'$argv\')" | pydt;:'
+if type arista-python
+  a amk 'a ws make -p (basename (git root || pwd))'
+  a assh 'arista-ssh login -p google'
+  a bump 'gb commit -a --amend --no-edit'
+  a copen 'code -r'
+  a dt 'a dt'
+  a dut 'dt gd | head -n1 | cut -d/ -f3'
+  a expire 'a mts supersede -R "Tests scheduled by MATT have expired."'
+  a freshen 'sudo swi freshen /images/EOS.swi'
+  a gb 'a git'
+  a lake 'nvim (curl -L dashboard/get_tests.py?id=$argv | jq -r .tests[0].logUrl).gz;:'
+  a lint 'a git lint'
+  a lunch 'gb launch --schedule build --testing full'
+  a oc 'gnmi -addr (dut):6030 -username admin get / | tail -n+2'
+  a pb 'curl -F c=@- pb/'
+  a pydt 'dt pyshell'
+  a reagent 'echo "edut.restartAgent(\'$argv\')" | pydt;:'
+  a revdiff 'curl -L reviewboard/r/$argv/diff/raw'
+  a revfiles 'revdiff $argv | cut -f1 | sed -n "s|+++ |/|p";:'
+  a san 'dt sa -p eos-trunk'
+  a startoc 'dt ssh run "en ; conf ; management api gnmi ; transport grpc default"'
+  a rebase 'gb update --sync --rebase'
+  a san 'dt sa -p eos-trunk'
+  a tcam 'echo "edut.setTcamProfile(\'$argv\')" | pydt;:'
+  a topic 'gb checkout'
+end
 
 for i in (cut -d ' ' -f1 < ~/.config/qutebrowser/quickmarks)
   a $i "qutebrowser / \":open $i\""
diff --git a/qutebrowser/adblock.py b/qutebrowser/adblock.py
index 7022046..1f589e1 100644
--- a/qutebrowser/adblock.py
+++ b/qutebrowser/adblock.py
@@ -3,16 +3,19 @@ host("https://www.github.developerdan.com/hosts/lists/facebook-extended.txt")
 
 c.content.blocking.adblock.lists = []
 abp = c.content.blocking.adblock.lists.append
-abp("https://fanboy.co.nz/r/fanboy-ultimate.txt")
-abp("https://fanboy.co.nz/fanboy-antifacebook.txt")
-abp("https://fanboy.co.nz/fanboy-annoyance.txt")
-abp("https://fanboy.co.nz/fanboy-cookiemonster.txt")
-abp("https://easylist-downloads.adblockplus.org/antiadblockfilters.txt")
 abp("https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt")
-abp("https://easylist-downloads.adblockplus.org/easylist.txt")
-abp("https://easylist-downloads.adblockplus.org/easyprivacy.txt")
+abp("https://easylist-downloads.adblockplus.org/antiadblockfilters.txt")
+abp("https://fanboy.co.nz/fanboy-antifacebook.txt")
+abp("https://fanboy.co.nz/fanboy-cookiemonster.txt")
+abp("https://fanboy.co.nz/r/fanboy-ultimate.txt")
 
-abp("https://github.com/DandelionSprout/adfilt/raw/master/LegitimateURLShortener.txt")
 abp("https://github.com/DandelionSprout/adfilt/raw/master/AnnoyancesList")
-abp("https://github.com/DandelionSprout/adfilt/raw/master/SocialShareList.txt")
 abp("https://github.com/DandelionSprout/adfilt/raw/master/ExtremelyCondensedList.txt")
+abp("https://github.com/DandelionSprout/adfilt/raw/master/LegitimateURLShortener.txt")
+abp("https://github.com/DandelionSprout/adfilt/raw/master/SocialShareList.txt")
+
+abp("https://github.com/hagezi/dns-blocklists/raw/main/adblock/pro.mini.txt")
+abp("https://github.com/iam-py-test/uBlock-combo/raw/main/list.txt")
+abp("https://github.com/liamengland1/miscfilters/raw/master/antipaywall.txt")
+abp("https://github.com/mchangrh/yt-neuter/raw/main/yt-neuter.txt")
+abp("https://github.com/yokoffing/filterlists/raw/main/privacy_essentials.txt")