diff --git a/.dotter/global.toml b/.dotter/global.toml index 0ab95d7..3333159 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -54,7 +54,9 @@ office = "~" pass = "~" [qutebrowser.files] -qutebrowser = "~" +"qutebrowser/config" = "~/.config/qutebrowser" +"qutebrowser/scripts" = "~/.local/bin" +"qutebrowser/data" = "~/.local/share/qutebrowser" [scripts.files] "scripts/README.md" = { target = "~/README.md", type = "symbolic", if = "false" } diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/qutedmenu b/qutebrowser/.local/share/qutebrowser/userscripts/qutedmenu deleted file mode 120000 index 388267f..0000000 --- a/qutebrowser/.local/share/qutebrowser/userscripts/qutedmenu +++ /dev/null @@ -1 +0,0 @@ -../../../bin/qutedmenu \ No newline at end of file diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/recently-downloaded b/qutebrowser/.local/share/qutebrowser/userscripts/recently-downloaded deleted file mode 120000 index 8242361..0000000 --- a/qutebrowser/.local/share/qutebrowser/userscripts/recently-downloaded +++ /dev/null @@ -1 +0,0 @@ -../../../bin/recently-downloaded \ No newline at end of file diff --git a/qutebrowser/.config/qutebrowser/alias.py b/qutebrowser/config/alias.py similarity index 100% rename from qutebrowser/.config/qutebrowser/alias.py rename to qutebrowser/config/alias.py diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/config/config.py similarity index 100% rename from qutebrowser/.config/qutebrowser/config.py rename to qutebrowser/config/config.py diff --git a/qutebrowser/.config/qutebrowser/content.py b/qutebrowser/config/content.py similarity index 100% rename from qutebrowser/.config/qutebrowser/content.py rename to qutebrowser/config/content.py diff --git a/qutebrowser/.config/qutebrowser/maps.py b/qutebrowser/config/maps.py similarity index 100% rename from qutebrowser/.config/qutebrowser/maps.py rename to qutebrowser/config/maps.py diff --git a/qutebrowser/.config/qutebrowser/redirects.py b/qutebrowser/config/redirects.py similarity index 97% rename from qutebrowser/.config/qutebrowser/redirects.py rename to qutebrowser/config/redirects.py index 42ee797..0becf2f 100644 --- a/qutebrowser/.config/qutebrowser/redirects.py +++ b/qutebrowser/config/redirects.py @@ -17,7 +17,7 @@ def fixScribePath(url: QUrl): # unquoted = parse.unquote( # url.path(options=QUrl.ComponentFormattingOption.FullyEncoded) # ) - path = parse.unquote(f"{url.path()}{url.query()}", encoding='ascii') + path = parse.unquote(f"{url.path()}{url.query()}", encoding="ascii") url.setQuery(None) new_path = re.sub(r"m/global-identity-2redirectUrl=", "", path) url.setPath( @@ -194,8 +194,10 @@ redirects = { }, } +def rewrite(request: interceptor.Request) -> None: + # if config.get(name="content.oss_redirects") is False: + # return -def rewrite(request: interceptor.Request): if ( request.resource_type != interceptor.ResourceType.main_frame or request.request_url.scheme() in {"data", "blob"} diff --git a/qutebrowser/.config/qutebrowser/searchengines.py b/qutebrowser/config/searchengines.py similarity index 100% rename from qutebrowser/.config/qutebrowser/searchengines.py rename to qutebrowser/config/searchengines.py diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/aol.com.xml b/qutebrowser/data/cookie-blockers/aol.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/aol.com.xml rename to qutebrowser/data/cookie-blockers/aol.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/blocklist.txt b/qutebrowser/data/cookie-blockers/blocklist.txt similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/blocklist.txt rename to qutebrowser/data/cookie-blockers/blocklist.txt diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/consent.youtube.com.xml b/qutebrowser/data/cookie-blockers/consent.youtube.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/consent.youtube.com.xml rename to qutebrowser/data/cookie-blockers/consent.youtube.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/ebay.com.xml b/qutebrowser/data/cookie-blockers/ebay.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/ebay.com.xml rename to qutebrowser/data/cookie-blockers/ebay.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/espn.com.xml b/qutebrowser/data/cookie-blockers/espn.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/espn.com.xml rename to qutebrowser/data/cookie-blockers/espn.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/etsy.com.xml b/qutebrowser/data/cookie-blockers/etsy.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/etsy.com.xml rename to qutebrowser/data/cookie-blockers/etsy.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/facebook.com.xml b/qutebrowser/data/cookie-blockers/facebook.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/facebook.com.xml rename to qutebrowser/data/cookie-blockers/facebook.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/foxnews.com.xml b/qutebrowser/data/cookie-blockers/foxnews.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/foxnews.com.xml rename to qutebrowser/data/cookie-blockers/foxnews.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/geeksforgeeks.org.xml b/qutebrowser/data/cookie-blockers/geeksforgeeks.org.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/geeksforgeeks.org.xml rename to qutebrowser/data/cookie-blockers/geeksforgeeks.org.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/google.com.xml b/qutebrowser/data/cookie-blockers/google.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/google.com.xml rename to qutebrowser/data/cookie-blockers/google.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/healthline.com.xml b/qutebrowser/data/cookie-blockers/healthline.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/healthline.com.xml rename to qutebrowser/data/cookie-blockers/healthline.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/indeed.com.xml b/qutebrowser/data/cookie-blockers/indeed.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/indeed.com.xml rename to qutebrowser/data/cookie-blockers/indeed.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/instagram.com.xml b/qutebrowser/data/cookie-blockers/instagram.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/instagram.com.xml rename to qutebrowser/data/cookie-blockers/instagram.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/linkedin.com.xml b/qutebrowser/data/cookie-blockers/linkedin.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/linkedin.com.xml rename to qutebrowser/data/cookie-blockers/linkedin.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/medicalnews.com.xml b/qutebrowser/data/cookie-blockers/medicalnews.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/medicalnews.com.xml rename to qutebrowser/data/cookie-blockers/medicalnews.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/medicalnewstoday.com.xml b/qutebrowser/data/cookie-blockers/medicalnewstoday.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/medicalnewstoday.com.xml rename to qutebrowser/data/cookie-blockers/medicalnewstoday.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/microsoft.com.xml b/qutebrowser/data/cookie-blockers/microsoft.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/microsoft.com.xml rename to qutebrowser/data/cookie-blockers/microsoft.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/netflix.com.xml b/qutebrowser/data/cookie-blockers/netflix.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/netflix.com.xml rename to qutebrowser/data/cookie-blockers/netflix.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/nytimes.com.xml b/qutebrowser/data/cookie-blockers/nytimes.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/nytimes.com.xml rename to qutebrowser/data/cookie-blockers/nytimes.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/paypal.com.xml b/qutebrowser/data/cookie-blockers/paypal.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/paypal.com.xml rename to qutebrowser/data/cookie-blockers/paypal.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/reddit.com.xml b/qutebrowser/data/cookie-blockers/reddit.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/reddit.com.xml rename to qutebrowser/data/cookie-blockers/reddit.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/roblox.com.xml b/qutebrowser/data/cookie-blockers/roblox.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/roblox.com.xml rename to qutebrowser/data/cookie-blockers/roblox.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/stackoverflow.com.xml b/qutebrowser/data/cookie-blockers/stackoverflow.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/stackoverflow.com.xml rename to qutebrowser/data/cookie-blockers/stackoverflow.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/steampowered.com.xml b/qutebrowser/data/cookie-blockers/steampowered.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/steampowered.com.xml rename to qutebrowser/data/cookie-blockers/steampowered.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/twitter.com.xml b/qutebrowser/data/cookie-blockers/twitter.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/twitter.com.xml rename to qutebrowser/data/cookie-blockers/twitter.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/wolframalpha.com.xml b/qutebrowser/data/cookie-blockers/wolframalpha.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/wolframalpha.com.xml rename to qutebrowser/data/cookie-blockers/wolframalpha.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/cookie-blockers/yahoo.com.xml b/qutebrowser/data/cookie-blockers/yahoo.com.xml similarity index 100% rename from qutebrowser/.local/share/qutebrowser/cookie-blockers/yahoo.com.xml rename to qutebrowser/data/cookie-blockers/yahoo.com.xml diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/code_select.py b/qutebrowser/data/userscripts/code_select.py similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/code_select.py rename to qutebrowser/data/userscripts/code_select.py diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/doi2scihub b/qutebrowser/data/userscripts/doi2scihub similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/doi2scihub rename to qutebrowser/data/userscripts/doi2scihub diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/pagetopdf.sh b/qutebrowser/data/userscripts/pagetopdf.sh similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/pagetopdf.sh rename to qutebrowser/data/userscripts/pagetopdf.sh diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/qute-cookie-block b/qutebrowser/data/userscripts/qute-cookie-block similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/qute-cookie-block rename to qutebrowser/data/userscripts/qute-cookie-block diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/qute-gemini b/qutebrowser/data/userscripts/qute-gemini similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/qute-gemini rename to qutebrowser/data/userscripts/qute-gemini diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/qute-gemini-tab b/qutebrowser/data/userscripts/qute-gemini-tab similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/qute-gemini-tab rename to qutebrowser/data/userscripts/qute-gemini-tab diff --git a/qutebrowser/data/userscripts/qutedmenu b/qutebrowser/data/userscripts/qutedmenu new file mode 120000 index 0000000..530ccc5 --- /dev/null +++ b/qutebrowser/data/userscripts/qutedmenu @@ -0,0 +1 @@ +../../scripts/qutedmenu \ No newline at end of file diff --git a/qutebrowser/data/userscripts/recently-downloaded b/qutebrowser/data/userscripts/recently-downloaded new file mode 120000 index 0000000..3695961 --- /dev/null +++ b/qutebrowser/data/userscripts/recently-downloaded @@ -0,0 +1 @@ +../../scripts/recently-downloaded \ No newline at end of file diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/shaarli_add.sh b/qutebrowser/data/userscripts/shaarli_add.sh similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/shaarli_add.sh rename to qutebrowser/data/userscripts/shaarli_add.sh diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/translate_google.sh b/qutebrowser/data/userscripts/translate_google.sh similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/translate_google.sh rename to qutebrowser/data/userscripts/translate_google.sh diff --git a/qutebrowser/.local/share/qutebrowser/userscripts/wallabag_add.sh b/qutebrowser/data/userscripts/wallabag_add.sh similarity index 100% rename from qutebrowser/.local/share/qutebrowser/userscripts/wallabag_add.sh rename to qutebrowser/data/userscripts/wallabag_add.sh diff --git a/qutebrowser/.local/bin/qutedmenu b/qutebrowser/scripts/qutedmenu similarity index 100% rename from qutebrowser/.local/bin/qutedmenu rename to qutebrowser/scripts/qutedmenu diff --git a/qutebrowser/.local/bin/recently-downloaded b/qutebrowser/scripts/recently-downloaded similarity index 100% rename from qutebrowser/.local/bin/recently-downloaded rename to qutebrowser/scripts/recently-downloaded