From 725590ad8dc99e806643ef0991d32bd048add6d9 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 1 Apr 2024 00:06:49 +0300 Subject: [PATCH] home/jan/browser: change invidious host --- Makefile | 4 +- home/users/jan/browser/Redirector.json | 231 +++++++++++++------------ 2 files changed, 126 insertions(+), 109 deletions(-) diff --git a/Makefile b/Makefile index dc67098..79d0ca1 100644 --- a/Makefile +++ b/Makefile @@ -36,12 +36,12 @@ define machine_rule .PHONY: $(1) $(1): ; systemctl --user reset-failed - sudo $$(NIX_RUN)switch/$(1) + sudo nix run $(NIX_ARGS) .#switch/$(1) endef define vps_rule .PHONY: $(1) -$(1): ; $$(NIX_RUN)deploy/$(1) +$(1): ; nix run .#deploy/$(1) endef $(foreach machine,$(MACHINES),$(eval $(call machine_rule,$(machine)))) diff --git a/home/users/jan/browser/Redirector.json b/home/users/jan/browser/Redirector.json index 8e4cd32..b046df6 100644 --- a/home/users/jan/browser/Redirector.json +++ b/home/users/jan/browser/Redirector.json @@ -1,108 +1,125 @@ { - "createdBy": "Redirector v3.5.3", - "createdAt": "2024-03-19T12:51:41.662Z", - "redirects": [ - { - "description": "home youtube.com/youtu.be -> individous", - "exampleUrl": "https://www.youtube.com/", - "exampleResult": "https://yt.cdaut.de/", - "error": null, - "includePattern": "https://(?:www\\.)?(youtube\\.com|youtu.be)/$", - "excludePattern": "", - "patternDesc": "get home page ", - "redirectUrl": "https://yt.cdaut.de/", - "patternType": "R", - "processMatches": "noProcessing", - "disabled": false, - "grouped": false, - "appliesTo": [ - "main_frame" - ] - }, - { - "description": "youtu.be -> individous", - "exampleUrl": "https://youtu.be/MYRBI-X5nfhI?si=sSoZBk9bB7NSEE8j", - "exampleResult": "https://yt.cdaut.de/watch?v=MYRBI-X5nfhI", - "error": null, - "includePattern": "https://youtu.be/([\\w-]+)(\\?.*)?", - "excludePattern": "", - "patternDesc": "get video id from url", - "redirectUrl": "https://yt.cdaut.de/watch?v=$1", - "patternType": "R", - "processMatches": "noProcessing", - "disabled": false, - "grouped": false, - "appliesTo": [ - "main_frame" - ] - }, - { - "description": "youtube.com -> individous", - "exampleUrl": "https://www.youtube.com/watch?v=jQ-KdWyzKfE", - "exampleResult": "https://yt.cdaut.de/watch?v=jQ-KdWyzKfE", - "error": null, - "includePattern": "https://(?:www\\.)?youtube\\.com/watch\\?v=([\\w-]+)(&.*)?", - "excludePattern": "", - "patternDesc": "get video id from url", - "redirectUrl": "https://yt.cdaut.de/watch?v=$1", - "patternType": "R", - "processMatches": "noProcessing", - "disabled": false, - "grouped": false, - "appliesTo": [ - "main_frame" - ] - }, - { - "description": "youtube.com/shorts -> individous", - "exampleUrl": "https://www.youtube.com/shorts/jQkhyLSqlLg", - "exampleResult": "https://yt.cdaut.de/watch?v=jQkhyLSqlLg", - "error": null, - "includePattern": "https://(?:www\\.)?youtube\\.com/shorts/([\\w-]+)(&.*)?", - "excludePattern": "", - "patternDesc": "get video id from url", - "redirectUrl": "https://yt.cdaut.de/watch?v=$1", - "patternType": "R", - "processMatches": "noProcessing", - "disabled": false, - "grouped": false, - "appliesTo": [ - "main_frame" - ] - }, - { - "description": "youtube.com/live -> individous", - "exampleUrl": "https://www.youtube.com/live/jQ-KdWyzKfE", - "exampleResult": "https://yt.cdaut.de/watch?v=jQ-KdWyzKfE", - "error": null, - "includePattern": "https://(?:www\\.)?youtube\\.com/live/([\\w-]+)(\\?.*)?", - "excludePattern": "", - "patternDesc": "get video id from url", - "redirectUrl": "https://yt.cdaut.de/watch?v=$1", - "patternType": "R", - "processMatches": "noProcessing", - "disabled": false, - "grouped": false, - "appliesTo": [ - "main_frame" - ] - }, - { - "description": "youtube.com/channel -> individous", - "exampleUrl": "https://www.youtube.com/@KdWyzKfE", - "exampleResult": "https://yt.cdaut.de/@KdWyzKfE", - "error": null, - "includePattern": "https://(?:www\\.)?youtube\\.com/(@[\\w-]+)(\\?.*)?", - "excludePattern": "", - "patternDesc": "get channel name from url", - "redirectUrl": "https://yt.cdaut.de/$1", - "patternType": "R", - "processMatches": "noProcessing", - "disabled": false, - "grouped": false, - "appliesTo": [ - "main_frame" - ] - } - ] -} \ No newline at end of file + "createdBy": "Redirector v3.5.3", + "createdAt": "2024-03-31T20:54:38.657Z", + "redirects": [ + { + "description": "home youtube.com/youtu.be -> invidious", + "exampleUrl": "https://www.youtube.com/", + "exampleResult": "https://inv.oikei.net/", + "error": null, + "includePattern": "https://(?:www\\.)?(youtube\\.com|youtu.be)/$", + "excludePattern": "", + "patternDesc": "get home page ", + "redirectUrl": "https://inv.oikei.net/", + "patternType": "R", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + }, + { + "description": "youtu.be -> invidious", + "exampleUrl": "https://youtu.be/MYRBI-X5nfhI?si=sSoZBk9bB7NSEE8j", + "exampleResult": "https://inv.oikei.net/watch?v=MYRBI-X5nfhI", + "error": null, + "includePattern": "https://youtu.be/([\\w-]+)(\\?.*)?", + "excludePattern": "", + "patternDesc": "get video id from url", + "redirectUrl": "https://inv.oikei.net/watch?v=$1", + "patternType": "R", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + }, + { + "description": "youtube.com -> invidious", + "exampleUrl": "https://www.youtube.com/watch?v=jQ-KdWyzKfE", + "exampleResult": "https://inv.oikei.net/watch?v=jQ-KdWyzKfE", + "error": null, + "includePattern": "https://(?:www\\.)?youtube\\.com/watch\\?v=([\\w-]+)(&.*)?", + "excludePattern": "", + "patternDesc": "get video id from url", + "redirectUrl": "https://inv.oikei.net/watch?v=$1", + "patternType": "R", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + }, + { + "description": "youtube.com/shorts -> invidious", + "exampleUrl": "https://www.youtube.com/shorts/jQkhyLSqlLg", + "exampleResult": "https://inv.oikei.net/watch?v=jQkhyLSqlLg", + "error": null, + "includePattern": "https://(?:www\\.)?youtube\\.com/shorts/([\\w-]+)(&.*)?", + "excludePattern": "", + "patternDesc": "get video id from url", + "redirectUrl": "https://inv.oikei.net/watch?v=$1", + "patternType": "R", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + }, + { + "description": "youtube.com/live -> invidious", + "exampleUrl": "https://www.youtube.com/live/jQ-KdWyzKfE", + "exampleResult": "https://inv.oikei.net/watch?v=jQ-KdWyzKfE", + "error": null, + "includePattern": "https://(?:www\\.)?youtube\\.com/live/([\\w-]+)(\\?.*)?", + "excludePattern": "", + "patternDesc": "get video id from url", + "redirectUrl": "https://inv.oikei.net/watch?v=$1", + "patternType": "R", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + }, + { + "description": "youtube.com/channel -> invidious", + "exampleUrl": "https://www.youtube.com/@KdWyzKfE", + "exampleResult": "https://inv.oikei.net/@KdWyzKfE", + "error": null, + "includePattern": "https://(?:www\\.)?youtube\\.com/(@[\\w-]+)(\\?.*)?", + "excludePattern": "", + "patternDesc": "get channel name from url", + "redirectUrl": "https://inv.oikei.net/$1", + "patternType": "R", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + }, + { + "description": "indivious (old -> current)", + "exampleUrl": "https://yt.cdaut.de/watch?v=jUnhS74uicE", + "exampleResult": "https://inv.oikei.net/watch?v=jUnhS74uicE", + "error": null, + "includePattern": "https://yt.cdaut.de/*", + "excludePattern": "", + "patternDesc": "Redirect from old instances", + "redirectUrl": "https://inv.oikei.net/$1", + "patternType": "W", + "processMatches": "noProcessing", + "disabled": false, + "grouped": false, + "appliesTo": [ + "main_frame" + ] + } + ] +}