From 614caf7d6f35fc9c265ce0a8a697fe518550e7ba Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 16 Dec 2024 12:13:20 +0000 Subject: [PATCH] Add selfhosted services to qutebroser --- flake.lock | 40 ++++++++++++++-------------- modules/home/desktop/development.nix | 9 ++++--- modules/nixos/server/search.nix | 15 +++++++++-- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index df6ba5c..b224671 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730687397, - "narHash": "sha256-xluSdua/nB7BVpSx7C3PY5XJOsr9x0IsUwuVHJFpJ+Y=", + "lastModified": 1733551027, + "narHash": "sha256-nlZWAq4E+cNywCuxpnYcyky4fd+8bVzJHrS2e8QTtVs=", "ref": "refs/heads/main", - "rev": "32894dcff264ee50e56f58130ac59bd86a7afb45", - "revCount": 17, + "rev": "7f041ffa7f204deb0fc2e36908b382804f2e108d", + "revCount": 18, "type": "git", "url": "https://git.xeno.science/xenofem/actual-nix.git" }, @@ -225,16 +225,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733769654, + "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "e952e94955dcc6fa2120c1430789fc41363f5237", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -408,11 +408,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732608183, - "narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=", + "lastModified": 1733835365, + "narHash": "sha256-htFKTDIu3ZiK/cFXiiQWXLNDKRdXWC8YXkhDtt5nsPE=", "owner": "danth", "repo": "stylix", - "rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334", + "rev": "9f019b78fd5ff6ecb352269fc73bbcd1d35c90a8", "type": "github" }, "original": { diff --git a/modules/home/desktop/development.nix b/modules/home/desktop/development.nix index 461aaf7..7e9a785 100644 --- a/modules/home/desktop/development.nix +++ b/modules/home/desktop/development.nix @@ -16,10 +16,11 @@ }; searchEngines = { - DEFAULT = "https://northboot.xyz/?q={}"; - np = "https://search.nixos.org/packages?query={}"; - no = "https://search.nixos.org/options?query={}"; - hm = "https://home-manager-options.extranix.com/?query={}"; + DEFAULT = "https://search.muon.host/?q={}"; + np = "https://search.nixos.org/packages?channel=unstable&query={}"; + no = "https://search.nixos.org/options?channel=unstable&query={}"; + hm = + "https://home-manager-options.extranix.com/?release=master&query={}"; }; extraConfig = '' diff --git a/modules/nixos/server/search.nix b/modules/nixos/server/search.nix index c8750d1..1a1a94c 100644 --- a/modules/nixos/server/search.nix +++ b/modules/nixos/server/search.nix @@ -23,8 +23,19 @@ in { enabled_plugins = [ "Hostnames plugin" "Tracker URL remover" ]; hostnames.remove = [ "(.*.)?facebook.com$" ]; hostnames.replace = { - "(.*.)?reddit.com$" = "redlib.northboot.xyz"; - "(.*.)?youtube.com$" = "invidious.example.com"; + # Self-hosted + "(.*.)?reddit.com$" = "reddit.muon.host"; + # "(.*.)?youtube.com$" = "videos.muon.host"; # TODO not working + + # External + "(.*.)?youtube.com$" = "invidious.nerdvpn.de"; + "(.*.)?imdb.com$" = "libremdb.iket.me"; + "(.*.)?imgur.com$" = "rimgo.privacyredirect.com"; + "(.*.)?twitch.com$" = "safetwitch.privacyredirect.com"; + "(.*.)?wikipedia.com$" = "wikiless.privacyredirect.com"; + "(.*.)?medium.com$" = "scribe.privacyredirect.com"; + "(.*.)?stackoverflow.com$" = "anonymousoverflow.privacyredirect.com"; + "(.*.)?github.com$" = "gothub.privacyredirect.com"; }; }; };