diff --git a/flake.lock b/flake.lock index bbda75f..bb7dc0a 100644 --- a/flake.lock +++ b/flake.lock @@ -358,11 +358,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1702416862, - "narHash": "sha256-BnoTPWHPr8haLAsit208aYRfb8BFGATbgIaplvLYCEA=", + "lastModified": 1702488319, + "narHash": "sha256-goxBCjjWitvx2Oq4AihpA2OhYEirolMLC48fdA7Iey8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d9bc210285c1971afd9abe9fbe89a5a14c8df2a7", + "rev": "01e5c59d752d3fe7fa484330fa48e010054b8fa1", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1702339467, - "narHash": "sha256-XRa5gCKoUz2XlNlrxCG163BMAsrnbh833s/ndCF/WMo=", + "lastModified": 1702425860, + "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, - "narHash": "sha256-d2ZF9nXKbgqoPSKRBulNM8D0PHAIlKf8Pu+WywGwurE=", + "lastModified": 1702419470, + "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, - "narHash": "sha256-HZbyUQrS5zMa6bBXVGQYIrPPkz2AzlXWq4QI97mupiI=", + "lastModified": 1702487693, + "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, - "narHash": "sha256-89HhMpiU48+PrZW/nkYxl9A2uRt94ud/J/FIf6k0dW8=", + "lastModified": 1702500249, + "narHash": "sha256-oSeFFxfjhIQikapcUMF35uCUWC5guDR/kVjXrPIw3E4=", "owner": "nix-community", "repo": "NUR", - "rev": "55ff7c9e06b3dd19be193158fb39df1a4623ea70", + "rev": "fbfc9fcd228c7de006181bef7bdeedc297ede138", "type": "github" }, "original": { diff --git a/home/firefox/addons/default.nix b/home/firefox/addons/default.nix index 1cce2b6..aa9f0d6 100644 --- a/home/firefox/addons/default.nix +++ b/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"; - url = "https://extension.7tv.gg/${version}/ext.xpi"; - sha256 = "sha256-dZyjFayvnLebSZHjMTTQFjcsxxpmc1aL5q17mLF3kG8="; + addonId = "frankerfacez@frankerfacez.com"; + url = "https://cdn.frankerfacez.com/script/frankerfacez-${version}-an+fx.xpi"; + sha256 = "sha256-U/yAra2c+RlGSaQtHfBz9XYsoDaJ67gmPJBsFrpqoE8="; meta = with lib; { - homepage = "https://7tv.app/"; - description = "The Web Extension for 7TV, bringing new features, emotes, vanity and performance to Twitch, Kick & YouTube"; + homepage = "https://www.frankerfacez.com/"; + 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; }; diff --git a/home/firefox/addons/ffz-settings (2023-12-13).json b/home/firefox/addons/ffz-settings (2023-12-13).json new file mode 100644 index 0000000..b745c0b --- /dev/null +++ b/home/firefox/addons/ffz-settings (2023-12-13).json @@ -0,0 +1 @@ +{"version":2,"type":"full","values":{"cfg-seen":["i18n.debug.capture","i18n.debug.transform","i18n.locale","i18n.format.date","i18n.format.time","i18n.format.datetime","data.use-staging","chat.update-when-loaded","chat.click-emotes","chat.sub-emotes","chat.emote-dialogs","chat.scrollback-length","chat.delay","chat.pin-resubs","auth.mode","socket.use-cluster","pubsub.use-cluster","chat.badges.media-queries","chat.badges.version","chat.badges.fix-colors","chat.badges.custom-mod","chat.badges.custom-vip","chat.badges.style","chat.badges.clickable","chat.badges.hidden","chat.emotes.enabled","chat.emotes.2x","chat.emotes.limit-size","chat.fix-bad-emotes","chat.emotes.animated","chat.effects.enable","chat.effects.FlipX","chat.effects.FlipY","chat.effects.ShrinkX","chat.effects.GrowX","chat.effects.Slide","chat.effects.Appear","chat.effects.Leave","chat.effects.Rotate","chat.effects.Rainbow","chat.effects.HyperRed","chat.effects.Shake","chat.effects.Photocopy","chat.effects.Jam","chat.effects.Bounce","chat.emoji.replace-joiner","chat.emoji.style","chat.actions.size","chat.actions.hover","chat.actions.hover-size","chat.actions.reasons","chat.actions.inline","chat.actions.user-context","chat.actions.room","chat.actions.room-above","chat.actions.rules-as-reasons","debug.link-resolver.source","debug.link-resolver.test","chat.timestamp-size","chat.font-size","chat.font-family","chat.width","chat.name-format","chat.lines.emote-alignment","chat.me-style","chat.timestamp-format","chat.extra-timestamps","chat.lines.alternate","chat.lines.padding","chat.lines.borders","chat.rich.enabled","chat.rich.want-mid","chat.rich.hide-tokens","chat.rich.all-links","chat.rich.minimum-level","chat.filtering.debug","chat.filtering.click-to-reveal","chat.filtering.process-own","chat.filtering.deleted-style","chat.filtering.display-deleted","chat.filtering.display-mod-action","chat.filtering.ignore-clear","chat.filtering.remove-deleted","chat.automod.delete-messages","chat.automod.remove-messages","chat.automod.run-as-mod","chat.filtering.hidden-tokens","chat.filtering.pad-bottom","chat.filtering.highlight-basic-users","chat.filtering.highlight-basic-users-blocked","chat.filtering.highlight-basic-badges","chat.filtering.highlight-basic-badges-blocked","chat.filtering.highlight-basic-terms","chat.filtering.highlight-tokens","chat.filtering.all-mentions","chat.filtering.color-mentions","chat.filtering.bold-mentions","chat.filtering.mention-priority","chat.filtering.mention-color","chat.filtering.highlight-mentions","chat.filtering.highlight-basic-blocked","chat.filtering.clickable-mentions","tooltip.images","tooltip.badge-images","tooltip.emote-sources","tooltip.emote-images","tooltip.emote-images.animated","tooltip.rich-links","tooltip.link-interaction","tooltip.link-images","tooltip.link-nsfw-images","chat.adjustment-mode","chat.adjustment-contrast","chat.bits.stack","chat.bits.animated","chat.bits.show","chat.bits.cheer-notice","link-cards.enable","link-cards.use-destination","ffz.search.matches-only","layout.display-bits-button","layout.theatre-navigation","layout.minimal-navigation","layout.turbo-cta","layout.prime-offers","layout.hide-discover-luna","ffz.show-new-settings","metadata.clip-download","metadata.player-stats","metadata.stream-delay-warning","metadata.uptime","metadata.viewers","metadata.viewers.no-native","metadata.uptime.no-native","metadata.featured-follow","channel.auto-click-off-featured","channel.auto-skip-trailer","channel.auto-click-chat","channel.panel-tips","channel.extra-links","channel.show-celebrations","channel.hide-unfollow","channel.hide-live-indicator","channel.round-avatars","player.hide-event-bar","chat.scroller.freeze","chat.scroller.freeze-requires-hover","chat.scroller.hover-delay","chat.scroller.smooth-scroll","chat.input.hide-identity","chat.inline-preview.enabled","chat.input.show-mod-view","chat.input.show-highlight","chat.input.show-shield","chat.input.show-elevate-your-message","chat.emote-menu.shortcut","chat.emote-menu.modifiers","chat.emote-menu.clear-search","chat.emote-menu.enabled","chat.emote-menu.default-tab","chat.emote-menu.effect-tab","chat.emote-menu.show-emoji","chat.emote-menu.combine-tabs","chat.emote-menu.stay-loaded","chat.emote-menu.icon","chat.emote-menu.show-quick-nav","chat.emote-menu.tall","chat.emote-menu.show-heading","chat.emote-menu.show-search","chat.emote-menu.reduced-padding","chat.emote-menu.sort-emotes","chat.emote-menu.sort-tiers-last","chat.hype.display-input","chat.mru.enabled","chat.tab-complete.ffz-emotes","chat.tab-complete.emoji","chat.tab-complete.emotes-without-colon","chat.tab-complete.limit-results","chat.tab-complete.prioritize-favorites","chat.tab-complete.prioritize-prefix-matches","chat.tab-complete.matching","chat.viewer-cards.highlight-chat","chat.viewer-cards.color","chat.disable-handling","chat.filtering.blocked-types","chat.replies.style","channel.raids.no-autojoin","channel.raids.blocked-channels","chat.hide-community-highlights","chat.subs.gift-banner","chat.banners.last-events","chat.banners.charity","chat.banners.hype-train","chat.banners.kappa-train","chat.banners.polls","chat.banners.prediction","chat.community-chest.show","chat.bits.show-pinned","chat.banners.drops","chat.points.allow-highlight","chat.points.show-callouts","chat.points.show-button","layout.portrait-min-chat","layout.subtember","layout.portrait","layout.portrait-invert","layout.portrait-threshold","chat.points.show-rewards","chat.points.auto-rewards","chat.drops.auto-rewards","chat.bits.show-rewards","chat.rituals.show","chat.hype.message-style","chat.hype.show-pinned","chat.subs.show","chat.subs.compact","chat.subs.merge-gifts","chat.subs.merge-gifts-visibility","metadata.modview.hide-info","layout.swap-sidebars","layout.side-nav.show","layout.side-nav.hide-viewers","layout.side-nav.show-avatars","layout.side-nav.show-rec-channels","layout.side-nav.show-friends","layout.side-nav.hide-offline","layout.side-nav.rerun-style","whispers.show","layout.theme.global-font","theme.font.size","directory.hidden.style","directory.hidden.reveal","directory.uptime","directory.hide-live","directory.hide-promoted","directory.hide-vodcasts","directory.hide-recommended","directory.block-titles","directory.blocked-tags","directory.default-sort","clips.layout.big","player.theatre.metadata","player.theatre.no-whispers","player.theatre.auto-enter","player.embed-metadata","player.fade-pause-buffer","player.no-autoplay","player.vod.autoplay","player.single-click-pause","player.home.autoplay","player.disable-content-warnings","player.allow-catchup","player.button.reset","player.hide-mouse","player.compressor.enable","player.compressor.default","player.compressor.shortcut","player.compressor.force-legacy","player.compressor.threshold","player.compressor.knee","player.compressor.ratio","player.compressor.attack","player.compressor.release","player.gain.enable","player.gain.no-volume","player.gain.scroll","player.gain.min","player.gain.max","player.gain.default","player.mute-click","player.volume-scroll","player.volume-scroll-steps","player.volume-always-shown","player.captions.font-size","player.captions.font-family","player.ext-hide","player.ext-interaction","player.fullscreen.auto-chat","sub-button.prime-notice","theme.disable-auto-dark","theme.legacy-dark-input","theme.color.background","theme.color.text","theme.color.accent","theme.color.tooltip.background","theme.color.tooltip.text","theme.color.chat-background","theme.color.chat-text","theme.color.chat-accent","chat.video-chat.timestamps","chat.video-chat.enabled","add-ons","addons.dev.server","experiments","i18n.debug.open","socket.info","profiles","backup","clear","provider","home","debug.graphql-test","faq","chat.filtering.syntax-help","feedback","feedback.log","changelog","addon-changelog","legal","debug.chat-test","directory.game.blocked-games","directory.game.hidden-thumbnails","addon-changelog.unread-mentions-counter","addon-changelog.smokemotes","addon-changelog.smm2-links","addon-changelog.screenshoter","addon-changelog.repetition-detector","addon-changelog.pronouns","addon-changelog.prattlenot","addon-changelog.poll-shim","addon-changelog.new-account-highlighter","addon-changelog.inline-tab-completion","addon-changelog.fs-chat","addon-changelog.first-message-highlighter","addon-changelog.ffzap-liriklive","addon-changelog.ffzap-bttv","addon-changelog.emoteless","addon-changelog.declutter","addon-changelog.deck","addon-changelog.clip-confirm","addon-changelog.chatterino-badges","addon-changelog.brcm","addon-changelog.aplatypuss-emotes","addon-changelog.ModTools","addon-changelog.7tv-emotes","addon.seventv_emotes.animated_avatars","addon.seventv_emotes.badges","addon.seventv_emotes.nametag_paints","addon.seventv_emotes.global_emotes","addon.seventv_emotes.channel_emotes","addon.seventv_emotes.personal_emotes","addon.seventv_emotes.unlisted_emotes","addon.seventv_emotes.update_messages","ffzap.betterttv.global_emoticons","ffzap.betterttv.arbitrary_emoticons","ffzap.betterttv.channel_emoticons","ffzap.betterttv.pro_badges","ffzap.betterttv.pro_emoticons","ffzap.core.remove_spaces","ffzap.core.message_deletion","ffzap.core.enable_highlight_sound","ffzap.core.highlight_sound","ffzap.core.highlight_sound_volume","ffzap.core.highlight_sound_prevent_own_channel","ffzap.core.highlight_sound_types","addon.chatterino_badges.badges","first_message_highlight.priority","first_message_highlight.highlight_color","first_message_highlight.remember_historical","first_message_highlight.highlight_historical","first_message_highlight.only_moderated_channels","addon.inlinetab.tips","addon.inlinetab.tip-count","addon.inlinetab.no_commands","addon.inlinetab.no_mentions","addon.inlinetab.mention_prefix","newusers.minage","newusers.priority","newusers.highlightcolor","addon.pronouns.color","addon.pronouns.border","addon.pronouns.color.aeaer","addon.pronouns.color.any","addon.pronouns.color.eem","addon.pronouns.color.faefaer","addon.pronouns.color.hehim","addon.pronouns.color.heshe","addon.pronouns.color.hethem","addon.pronouns.color.itits","addon.pronouns.color.other","addon.pronouns.color.perper","addon.pronouns.color.sheher","addon.pronouns.color.shethem","addon.pronouns.color.theythem","addon.pronouns.color.vever","addon.pronouns.color.xexem","addon.pronouns.color.ziehir"],"cfg-collapsed":[],"addons.enabled":["7tv-emotes","ffzap-core","ffzap-bttv","chatterino-badges","first-message-highlighter","inline-tab-completion","new-account-highlighter","pronouns"],"p:0:addon.seventv_emotes.unlisted_emotes":true,"p:0:addon.seventv_emotes.nametag_paints":false,"p:0:layout.portrait":true,"p:0:layout.portrait-min-chat":true,"p:0:layout.subtember":false,"p:0:clips.layout.big":true,"p:0:layout.side-nav.hide-offline":true,"p:0:layout.display-bits-button":false,"p:0:layout.hide-discover-luna":true,"p:0:layout.turbo-cta":false,"p:0:layout.prime-offers":false,"p:0:channel.auto-click-chat":true,"p:0:channel.auto-skip-trailer":true,"p:0:metadata.player-stats":true,"p:0:sub-button.prime-notice":false,"p:0:chat.bits.show-pinned":false,"p:0:chat.community-chest.show":false,"p:0:chat.rich.all-links":true,"p:0:chat.subs.merge-gifts":20,"p:0:chat.filtering.ignore-clear":true,"p:0:chat.filtering.remove-deleted":0,"p:0:chat.filtering.display-deleted":"DETAILED","p:0:chat.bits.animated":false,"p:0:chat.bits.cheer-notice":false,"p:0:chat.bits.show":false,"p:0:chat.points.auto-rewards":true,"p:0:chat.points.show-rewards":false,"p:0:chat.points.show-callouts":false,"p:0:chat.drops.auto-rewards":true,"p:0:chat.emote-menu.icon":true,"p:0:chat.emote-menu.show-quick-nav":true,"p:0:chat.emote-menu.tall":true,"p:0:chat.emote-menu.clear-search":true,"p:0:chat.emote-menu.combine-tabs":true,"p:0:directory.hide-recommended":false,"p:0:player.disable-content-warnings":true,"p:0:player.home.autoplay":false,"p:0:player.single-click-pause":true,"p:0:player.vod.autoplay":false}} \ No newline at end of file diff --git a/home/firefox/addons/generated-firefox-addons.nix b/home/firefox/addons/generated-firefox-addons.nix index bc03196..195f9c9 100644 --- a/home/firefox/addons/generated-firefox-addons.nix +++ b/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"; - sha256 = "83d012878021fb5fe25bee1101a7a760974ae9e2949b80fd99b73d3da48b1f99"; + url = "https://addons.mozilla.org/firefox/downloads/file/4207077/ttv_lol_pro-2.2.2.xpi"; + sha256 = "6cfb2b8cc59f2ab8f1d5dfcb98365f181eee31f5a529bf9ba5ab09dae96be12a"; meta = with lib; { homepage = "https://github.com/younesaassila/ttv-lol-pro"; description = "TTV LOL PRO removes most livestream ads from Twitch."; diff --git a/home/firefox/addons/seventv_settings.json b/home/firefox/addons/seventv_settings.json deleted file mode 100644 index b5b2a75..0000000 --- a/home/firefox/addons/seventv_settings.json +++ /dev/null @@ -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}]} \ No newline at end of file diff --git a/updateSha.sh b/updateSha.sh index 002bed0..f33b9b1 100755 --- a/updateSha.sh +++ b/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