diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 5998369..38b12bd 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -3,23 +3,12 @@ c.content.fullscreen.window = True c.content.user_stylesheets = ['adblock.css', 'dracula.css', 'user.css'] c.confirm_quit = ['downloads'] -c.downloads.location.directory = '~/Downloads' c.qt.workarounds.remove_service_workers = True - -c.url.searchengines['!'] = 'farside.link/librey/search.php?q=!{}' -c.url.searchengines['4'] = 'farside.link/4get/web?s={}' -c.url.searchengines['a'] = 'annas-archive.org/search?q={}' -c.url.searchengines['l'] = 'farside.link/librey/search.php?q={}' -c.url.searchengines['m'] = 'https://search.marginalia.nu/search?query={}' -c.url.searchengines['s'] = 'farside.link/searxng/search?q={}' -c.url.searchengines['x'] = 'aldeid.com/wiki/X86-assembly/Instructions/{}' -c.url.searchengines['y'] = 'farside.link/invidious/search?q={}' -c.url.searchengines['z'] = 'zeldawiki.wiki/wiki/{}' -c.url.searchengines['DEFAULT'] = c.url.searchengines['s'] c.url.start_pages = c.url.default_page = 'minifocs.fly.dev' config.source('adblock.py') config.source('bindings.py') config.source('redirects.py') +config.source('search.py') config.source('sites.py') config.source('theme.py') diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks index 9e9bfe5..7828c3e 100644 --- a/qutebrowser/quickmarks +++ b/qutebrowser/quickmarks @@ -2,3 +2,5 @@ discord canary.discord.com/app outlook outlook.office.com/mail submitty submitty.cs.rpi.edu tuta app.tuta.com +brightspace brightspace.albany.edu +piazza piazza.com diff --git a/qutebrowser/redirects.py b/qutebrowser/redirects.py index 94a7f1d..fc8375e 100644 --- a/qutebrowser/redirects.py +++ b/qutebrowser/redirects.py @@ -5,7 +5,6 @@ import operator o = operator.methodcaller s = 'setHost' -i = interceptor def farside(url: QUrl, i) -> bool: url.setHost('farside.link') @@ -13,72 +12,76 @@ def farside(url: QUrl, i) -> bool: url.setPath(urljoin(i, p)) return True -def nitter(url: QUrl) -> bool: +def twitter(url: QUrl) -> bool: return farside(url, '/nitter/') -def rimgo(url: QUrl) -> bool: +def imgur(url: QUrl) -> bool: return farside(url, '/rimgo/') -def scribe(url: QUrl) -> bool: +def medium(url: QUrl) -> bool: return farside(url, '/scribe/') -def invid(url: QUrl) -> bool: +def youtube(url: QUrl) -> bool: return farside(url, '/invidious/') def reddit(url: QUrl) -> bool: return farside(url, '/libreddit/') -def bibliogram(url: QUrl) -> bool: - return farside(url, '/bibliogram/') -def simplytranslate(url: QUrl) -> bool: +def instagram(url: QUrl) -> bool: + return farside(url, '/proxigram/') +def translate(url: QUrl) -> bool: return farside(url, '/simplytranslate/') -def proxitok(url: QUrl) -> bool: +def tiktok(url: QUrl) -> bool: return farside(url, '/proxitok/') -def querte (url: QUrl) -> bool: +def quora (url: QUrl) -> bool: return farside(url, '/querte/') -def breezewiki (url: QUrl) -> bool: +def fandom(url: QUrl) -> bool: return farside(url, '/breezewiki/') -def dumb (url: QUrl) -> bool: +def genius(url: QUrl) -> bool: return farside(url, '/dumb/') -def anonymousoverflow (url: QUrl) -> bool: +def stackoverflow (url: QUrl) -> bool: return farside(url, '/anonymousoverflow/') +def wikipedia(url: QUrl) -> bool: + return farside(url, '/wikiless/') -map = { +m = { "reddit.com": reddit, "www.reddit.com": reddit, "old.reddit.com": reddit, - "youtu.be": invid, - "youtube.com": invid, - "www.youtube.com": invid, - "music.youtube.com": invid, + "youtu.be": youtube, + "youtube.com": youtube, + "www.youtube.com": youtube, + "music.youtube.com": youtube, - "twitter.com": nitter, - "mobile.twitter.com": nitter, - "x.com": nitter, + "twitter.com": twitter, + "mobile.twitter.com": twitter, + "x.com": twitter, - "imgur.com" : rimgo, - "medium.com" : scribe, - "www.instagram.com": bibliogram, - "translate.google.com" : simplytranslate, - "vm.tiktok.com" : proxitok, - "www.tiktok.com" : proxitok, - "www.quora.com": querte, - "fandom.com": breezewiki, - "www.fandom.com": breezewiki, - "genius.com" : dumb, - "stackoverflow.com" : anonymousoverflow, + "imgur.com" : imgur, + "medium.com" : medium, + "www.instagram.com": instagram, + "translate.google.com" : translate, + "vm.tiktok.com" : tiktok, + "www.tiktok.com" : tiktok, + "www.quora.com": quora, + "fandom.com": fandom, + "www.fandom.com": fandom, + "genius.com" : genius, + "stackoverflow.com" : stackoverflow, + "en.wikipedia.org" : wikipedia, - "www.twitch.tv" : o(s, 'twineo.deno.dev'), + "www.twitch.tv" : o(s, 'twineo.exozy.me'), "discord.com" : o(s, 'canary.discord.com'), "tumblr.com" : o(s, 'tumblash.fly.dev'), - "www.tumblr.com" : o(s, 'tumblash.fly.dev'), + "www.tumblr.com" : o(s, 'priviblur.fly.dev'), "www.npr.org" : o(s, 'text.npr.org'), "www.goodreads.com" : o(s, 'bl.vern.cc'), "zelda.fandom.com" : o(s, 'zeldawiki.wiki'), - "news.ycombinator.com" : o(s, 'news.workers.tools') + "news.ycombinator.com" : o(s, 'news.workers.tools'), + "www.pixiv.net" : o(s, 'pixivfe.exozy.me'), } -def f(info: i.Request): - if (info.resource_type != i.ResourceType.main_frame or +def rewrite(info: interceptor.Request): + if (info.resource_type != interceptor.ResourceType.main_frame or info.request_url.scheme() in {"data", "blob"}): return url = info.request_url - redir = map.get(url.host()) + redir = m.get(url.host()) if redir is not None and redir(url) is not False: info.redirect(url) -i.register(f) +interceptor.register(rewrite) diff --git a/qutebrowser/search.py b/qutebrowser/search.py new file mode 100644 index 0000000..87687c7 --- /dev/null +++ b/qutebrowser/search.py @@ -0,0 +1,13 @@ +c.url.searchengines['!'] = 'farside.link/librey/search.php?q=!{}' +c.url.searchengines['4'] = 'farside.link/4get/web?s={}' +c.url.searchengines['4'] = '4get.lvkaszus.pl/web?s={}' +c.url.searchengines['a'] = 'annas-archive.org/search?q={}' +c.url.searchengines['aw'] = 'wiki.archlinux.org/title/{}' +c.url.searchengines['l'] = 'farside.link/librey/search.php?q={}' +c.url.searchengines['l'] = 'search.ahwx.org/search.php?q={}' +c.url.searchengines['m'] = 'search.marginalia.nu/search?query={}' +c.url.searchengines['s'] = 'farside.link/searxng/search?q={}' +c.url.searchengines['w'] = 'farside.link/wikiless/wiki/{}?lang=en' +c.url.searchengines['y'] = 'farside.link/invidious/search?q={}' +c.url.searchengines['z'] = 'zeldawiki.wiki/wiki/{}' +c.url.searchengines['DEFAULT'] = c.url.searchengines['l'] diff --git a/qutebrowser/theme.py b/qutebrowser/theme.py index 162d794..7646ebc 100644 --- a/qutebrowser/theme.py +++ b/qutebrowser/theme.py @@ -46,7 +46,7 @@ cct.selected.odd.fg = 'black' cc.messages.warning.bg = 'red' cc.messages.warning.border = 'red' -#cc.webpage.darkmode.enabled = True +cc.webpage.darkmode.enabled = True cc.webpage.preferred_color_scheme = 'dark' cc.webpage.darkmode.policy.images = 'never'