feat(firefox): switch to ffz

flake.lock

@@ -358,11 +358,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1702416862,
+        "lastModified": 1702488319,
-        "narHash": "sha256-BnoTPWHPr8haLAsit208aYRfb8BFGATbgIaplvLYCEA=",
+        "narHash": "sha256-goxBCjjWitvx2Oq4AihpA2OhYEirolMLC48fdA7Iey8=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d9bc210285c1971afd9abe9fbe89a5a14c8df2a7",
+        "rev": "01e5c59d752d3fe7fa484330fa48e010054b8fa1",
         "type": "github"
       },
       "original": {
@@ -426,11 +426,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702339467,
+        "lastModified": 1702425860,
-        "narHash": "sha256-XRa5gCKoUz2XlNlrxCG163BMAsrnbh833s/ndCF/WMo=",
+        "narHash": "sha256-OSnsE8Po3f/iGYhtaMLAZbzTXIfkYl6lOEDj9SGHNdE=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "9a5be2169fb02ab226f6f4d3a0d867e1e1f4387e",
+        "rev": "331bf7d82d0fd66c118dfff92e8400217ce64515",
         "type": "github"
       },
       "original": {
@@ -449,11 +449,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1702323053,
+        "lastModified": 1702419470,
-        "narHash": "sha256-d2ZF9nXKbgqoPSKRBulNM8D0PHAIlKf8Pu+WywGwurE=",
+        "narHash": "sha256-R5Ce+MY0VIM8ZU1Zswy7Ir+QWvCj9nI8zckw2f/s3mU=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "8097b4a7252ec37dbf14bcc1b7c50c12343e54c4",
+        "rev": "d65c6a0bafada059e87a11a4bcd129afc16d2e5d",
         "type": "github"
       },
       "original": {
@@ -719,11 +719,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1702413367,
+        "lastModified": 1702487693,
-        "narHash": "sha256-HZbyUQrS5zMa6bBXVGQYIrPPkz2AzlXWq4QI97mupiI=",
+        "narHash": "sha256-Plw+a91l06rGB2z6VrJ2q2MZpoeQB33csgYLhPtDYuQ=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "b302a344444c194f5f78a0d81e9c9aac8c26b168",
+        "rev": "51eea973296a5f8850983da38957f11331d7f557",
         "type": "github"
       },
       "original": {
@@ -878,11 +878,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1702417575,
+        "lastModified": 1702500249,
-        "narHash": "sha256-89HhMpiU48+PrZW/nkYxl9A2uRt94ud/J/FIf6k0dW8=",
+        "narHash": "sha256-oSeFFxfjhIQikapcUMF35uCUWC5guDR/kVjXrPIw3E4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "55ff7c9e06b3dd19be193158fb39df1a4623ea70",
+        "rev": "fbfc9fcd228c7de006181bef7bdeedc297ede138",
         "type": "github"
       },
       "original": {

home/firefox/addons/default.nix

@@ -40,17 +40,17 @@ in
     inherit buildFirefoxXpiAddon;
 
     seventv = let
-      version = "v3.0.10.1000";
+      version = "4.0";
     in
       buildFirefoxXpiAddon {
-        pname = "seventv";
+        pname = "frankerfacez";
         inherit version;
-        addonId = "moz-addon@7tv.app";
+        addonId = "frankerfacez@frankerfacez.com";
-        url = "https://extension.7tv.gg/${version}/ext.xpi";
+        url = "https://cdn.frankerfacez.com/script/frankerfacez-${version}-an+fx.xpi";
-        sha256 = "sha256-dZyjFayvnLebSZHjMTTQFjcsxxpmc1aL5q17mLF3kG8=";
+        sha256 = "sha256-U/yAra2c+RlGSaQtHfBz9XYsoDaJ67gmPJBsFrpqoE8=";
         meta = with lib; {
-          homepage = "https://7tv.app/";
+          homepage = "https://www.frankerfacez.com/";
-          description = "The Web Extension for 7TV, bringing new features, emotes, vanity and performance to Twitch, Kick & YouTube";
+          description = "The Twitch Enhancement Suite. Get custom emotes and tons of new features you'll never want to go without.";
           license = licenses.asl20;
           platforms = platforms.all;
         };

home/firefox/addons/generated-firefox-addons.nix

@@ -79,10 +79,10 @@
   };
   "ttv-lol-pro" = buildFirefoxXpiAddon {
     pname = "ttv-lol-pro";
-    version = "2.2.1";
+    version = "2.2.2";
     addonId = "{76ef94a4-e3d0-4c6f-961a-d38a429a332b}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4179399/ttv_lol_pro-2.2.1.xpi";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4207077/ttv_lol_pro-2.2.2.xpi";
-    sha256 = "83d012878021fb5fe25bee1101a7a760974ae9e2949b80fd99b73d3da48b1f99";
+    sha256 = "6cfb2b8cc59f2ab8f1d5dfcb98365f181eee31f5a529bf9ba5ab09dae96be12a";
     meta = with lib; {
       homepage = "https://github.com/younesaassila/ttv-lol-pro";
       description = "TTV LOL PRO removes most livestream ads from Twitch.";

home/firefox/addons/seventv_settings.json

@@ -1 +0,0 @@
-{"timestamp":1697914605981,"settings":[{"key":"chat.alternating_background","type":"boolean","value":true,"timestamp":1697329498914},{"key":"chat.deleted_messages","type":"number","value":2,"timestamp":1697329507626},{"key":"chat.mod_messages","type":"boolean","value":true,"timestamp":1697329482669},{"key":"chat.timestamp_with_seconds","type":"boolean","value":false,"timestamp":1697329513608},{"key":"general.autoclaim.channel_points","type":"boolean","value":true,"timestamp":1697329532664},{"key":"highlights.basic.mention_title_flash","type":"boolean","value":true,"timestamp":1697329354766},{"key":"highlights.basic.self","type":"boolean","value":true,"timestamp":1697329558832},{"key":"highlights.custom","type":"object","value":[],"timestamp":1697329354321,"constructorName":"Map"},{"key":"layout.hide_bits_buttons","type":"boolean","value":true,"timestamp":1697329436637},{"key":"layout.hide_channel_leaderboard","type":"boolean","value":true,"timestamp":1697329390214},{"key":"layout.hide_community_highlights","type":"boolean","value":false,"timestamp":1697329413217},{"key":"layout.hide_hype_chat_button","type":"boolean","value":true,"timestamp":1697329442683},{"key":"layout.hide_pinned_hype_chats","type":"boolean","value":true,"timestamp":1697329417875},{"key":"layout.hide_prime_offers","type":"boolean","value":true,"timestamp":1697329446012},{"key":"layout.hide_react_buttons","type":"boolean","value":true,"timestamp":1697329433561},{"key":"layout.hide_recommended_channels","type":"boolean","value":true,"timestamp":1697329428437},{"key":"layout.hide_viewers_also_watch","type":"boolean","value":true,"timestamp":1697329425642},{"key":"player.action_onclick","type":"number","value":2,"timestamp":1697329383233},{"key":"player.skip_content_restriction","type":"boolean","value":true,"timestamp":1697329372106},{"key":"player.video_stats","type":"boolean","value":true,"timestamp":1697329375300}]}

updateSha.sh

@@ -17,7 +17,15 @@ parseNurl() {
 # https://gitlab.com/mishakmak/pam-fprint-grosshack
 # https://github.com/tio/input-emulator
 
-# https://extension.7tv.gg/manifest.moz.json
+updateFFZ() {
+    FILE="/home/matt/.nix/home/firefox/addons/default.nix"
+    URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"
+    HASH=$(nix store prefetch-file --refresh --json \
+        --hash-type sha256 $URL | jq -r .hash)
+
+    sed -i "s,sha256 = .*,sha256 = \"$HASH\";," "$FILE"
+}
+
 updateFirefoxAddons() {
     echo "Updating firefox addons using mozilla-addons-to-nix"
 
@@ -56,12 +64,14 @@ updateGSR() {
 }
 
 doAll() {
+    updateFFZ
     updateFirefoxAddons
     updateGSR
 }
 
 [[ "$1" == "-a" || "$1" == "--all" ]] && doAll
 [[ "$1" == "-f" || "$1" == "--firefox" ]] && updateFirefoxAddons
+[[ "$1" == "-ffz" || "$1" == "--frankerfacez" ]] && updateFFZ
 [[ "$1" == "-gsr" || "$1" == "--gpu-screen-recorder" ]] && updateGSR
 
 alejandra /home/matt/.nix