2025-03-12 HEAD master

4 files changed, 59 insertions, 361 deletions

diff --git a/modules/firefox/addons.json b/modules/firefox/addons.json
index e3867c1..4649d4d 100644
--- a/modules/firefox/addons.json
+++ b/modules/firefox/addons.json
@@ -26,16 +26,20 @@
     "slug": "no-pdf-download"
   },
   {
-    "slug": "plasma-integration"
+    "pname": "okta",
+    "slug": "okta-browser-plugin"
   },
   {
-    "pname": "rikaichamp",
-    "slug": "10ten-ja-reader"
+    "slug": "plasma-integration"
   },
   {
     "slug": "redirector"
   },
   {
+    "pname": "rikaichamp",
+    "slug": "10ten-ja-reader"
+  },
+  {
     "slug": "switchyomega"
   },
   {
diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix
index 3bb23d2..9854f8c 100644
--- a/modules/firefox/addons.nix
+++ b/modules/firefox/addons.nix
@@ -5,10 +5,10 @@
 {
   "bitwarden" = buildFirefoxXpiAddon {
     pname = "bitwarden";
-    version = "2024.11.2";
+    version = "2025.2.0";
     addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4392295/bitwarden_password_manager-2024.11.2.xpi";
-    sha256 = "38faecbfca76086a54e62b6e2036eae45e9d9f9f3aee4c7a72b652593f51b8e7";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4440363/bitwarden_password_manager-2025.2.0.xpi";
+    sha256 = "c4d7f355a2269620482f50edac7fce3c19f515190f24cdf80edc865f71d3a374";
     meta = with lib; {
       homepage = "https://bitwarden.com";
       description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.";
@@ -16,19 +16,18 @@
       mozPermissions = [
         "<all_urls>"
         "*://*/*"
-        "tabs"
-        "contextMenus"
-        "storage"
-        "unlimitedStorage"
+        "alarms"
         "clipboardRead"
         "clipboardWrite"
+        "contextMenus"
         "idle"
-        "alarms"
+        "storage"
+        "tabs"
+        "unlimitedStorage"
+        "webNavigation"
         "webRequest"
         "webRequestBlocking"
-        "webNavigation"
         "file:///*"
-        "https://lastpass.com/export.php"
       ];
       platforms = platforms.all;
     };
@@ -76,10 +75,10 @@
   };
   "indie-wiki-buddy" = buildFirefoxXpiAddon {
     pname = "indie-wiki-buddy";
-    version = "3.11.1";
+    version = "3.13.1";
     addonId = "{cb31ec5d-c49a-4e5a-b240-16c767444f62}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4379107/indie_wiki_buddy-3.11.1.xpi";
-    sha256 = "2b63271fa42e3d46a683605f719de816195471ccd8654771606d6eb811f7596d";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4435453/indie_wiki_buddy-3.13.1.xpi";
+    sha256 = "71dbed6b090604ea299c9661312c1ad5bc208c3ea3012b7890e38fb08994d703";
     meta = with lib; {
       homepage = "https://getindie.wiki/";
       description = "Helping you discover quality, independent wikis!\n\nWhen visiting a Fandom wiki, Indie Wiki Buddy redirects or alerts you of independent alternatives. It also filters search engine results. BreezeWiki is also supported, to reduce clutter on Fandom.";
@@ -334,10 +333,10 @@
   };
   "ipfs-companion" = buildFirefoxXpiAddon {
     pname = "ipfs-companion";
-    version = "3.1.0";
+    version = "3.2.0";
     addonId = "ipfs-firefox-addon@lidel.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4172699/ipfs_companion-3.1.0.xpi";
-    sha256 = "784f6d1e0497d86f1e42cfe7de8548b5cc28fabe80e50771d90f59ddf1b9d3c1";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4447471/ipfs_companion-3.2.0.xpi";
+    sha256 = "95b032a90f7e4349cb3778cdb9564b5c89d16c58d9aa12e2f223584ac143fb93";
     meta = with lib; {
       homepage = "https://github.com/ipfs/ipfs-companion";
       description = "Harness the power of IPFS in your browser";
@@ -360,10 +359,10 @@
   };
   "languagetool" = buildFirefoxXpiAddon {
     pname = "languagetool";
-    version = "8.13.2";
+    version = "8.14.3";
     addonId = "languagetool-webextension@languagetool.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4396724/languagetool-8.13.2.xpi";
-    sha256 = "e8a93ca046df390aaafeb7ba86254505ed3c593371c1f9e5af6892018d12de66";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4411930/languagetool-8.14.3.xpi";
+    sha256 = "f8c6c6b5ae7591ff62bfcaf93f7831651643312a64e0029fc4c153f7ca75295f";
     meta = with lib; {
       homepage = "https://languagetool.org";
       description = "With this extension you can check text with the free style and grammar checker LanguageTool. It finds many errors that a simple spell checker cannot detect, like mixing up there/their, a/an, or repeating a word.";
@@ -425,6 +424,29 @@
       platforms = platforms.all;
     };
   };
+  "okta" = buildFirefoxXpiAddon {
+    pname = "okta";
+    version = "6.38.0";
+    addonId = "plugin@okta.com";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4441853/okta_browser_plugin-6.38.0.xpi";
+    sha256 = "a26b30c29db3ff139cf313b1e19dbff5ea2836f29d59c2c28411c54e5d02c1fa";
+    meta = with lib; {
+      homepage = "https://www.okta.com";
+      description = "Okta Browser Plugin";
+      mozPermissions = [
+        "tabs"
+        "cookies"
+        "https://*/"
+        "http://*/"
+        "storage"
+        "unlimitedStorage"
+        "webRequest"
+        "webRequestBlocking"
+        "webNavigation"
+      ];
+      platforms = platforms.all;
+    };
+  };
   "plasma-integration" = buildFirefoxXpiAddon {
     pname = "plasma-integration";
     version = "1.9.1";
@@ -473,10 +495,10 @@
   };
   "rikaichamp" = buildFirefoxXpiAddon {
     pname = "rikaichamp";
-    version = "1.22.0";
+    version = "1.23.0";
     addonId = "{59812185-ea92-4cca-8ab7-cfcacee81281}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4371439/10ten_ja_reader-1.22.0.xpi";
-    sha256 = "d6f3197b7e3383f2723b9376d93e03fe515e5c610f9c0723d9618b10d3cc4bf1";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4424537/10ten_ja_reader-1.23.0.xpi";
+    sha256 = "4e37d31ec2c8c7f17de314b0812002de2d394c251dccb04d5eda44751db98660";
     meta = with lib; {
       homepage = "https://github.com/birchill/10ten-ja-reader/";
       description = "Quickly translate Japanese by hovering over words. Formerly released as Rikaichamp.";
@@ -495,27 +517,6 @@
       platforms = platforms.all;
     };
   };
-  "skip-redirect" = buildFirefoxXpiAddon {
-    pname = "skip-redirect";
-    version = "2.3.6";
-    addonId = "skipredirect@sblask";
-    url = "https://addons.mozilla.org/firefox/downloads/file/3920533/skip_redirect-2.3.6.xpi";
-    sha256 = "dbe8950245c1f475c5c1c6daab89c79b83ba4680621c91e80f15be7b09b618ae";
-    meta = with lib; {
-      description = "Some web pages use intermediary pages before redirecting to a final page. This add-on tries to extract the final url from the intermediary url and goes there straight away if successful.";
-      license = licenses.mit;
-      mozPermissions = [
-        "<all_urls>"
-        "clipboardWrite"
-        "contextMenus"
-        "notifications"
-        "storage"
-        "webRequest"
-        "webRequestBlocking"
-      ];
-      platforms = platforms.all;
-    };
-  };
   "switchyomega" = buildFirefoxXpiAddon {
     pname = "switchyomega";
     version = "2.5.10";
@@ -544,10 +545,10 @@
   };
   "ublock-origin" = buildFirefoxXpiAddon {
     pname = "ublock-origin";
-    version = "1.61.2";
+    version = "1.62.0";
     addonId = "uBlock0@raymondhill.net";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4391011/ublock_origin-1.61.2.xpi";
-    sha256 = "ee3a724a46ff32c17d1723077fecc6ede7fdab742154020b51fb6253ddcbba14";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4412673/ublock_origin-1.62.0.xpi";
+    sha256 = "8a9e02aa838c302fb14e2b5bc88a6036d36358aadd6f95168a145af2018ef1a3";
     meta = with lib; {
       homepage = "https://github.com/gorhill/uBlock#ublock-origin";
       description = "Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory.";
@@ -604,10 +605,10 @@
   };
   "violentmonkey" = buildFirefoxXpiAddon {
     pname = "violentmonkey";
-    version = "2.29.0";
+    version = "2.30.0";
     addonId = "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4398029/violentmonkey-2.29.0.xpi";
-    sha256 = "2edf39a824476b8a77a57c7c3abdaf3f685a679486e47450fab837b4bd71d469";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4426490/violentmonkey-2.30.0.xpi";
+    sha256 = "82932f9d6ba68a230ef57b1cdcf9f76226b2659f94249eeec0e4ffcc2b644394";
     meta = with lib; {
       homepage = "https://violentmonkey.github.io/";
       description = "Userscript support for browsers, open source.";
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index 0d1fe36..27f6bc2 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -70,7 +70,7 @@ in
 
             userContent = mkCssWithRoot ./userContent.css;
 
-            extensions =
+            extensions.packages =
               let
                 # This was done using the incredible addon generator[1]. All credit
                 # goes to Robert Helgesson.
@@ -109,6 +109,7 @@ in
                 languagetool
                 metamask
                 no-pdf-download
+                okta
                 redirector
                 rikaichamp
                 switchyomega
diff --git a/modules/firefox/userContent.css b/modules/firefox/userContent.css
index f068f20..82383a6 100644
--- a/modules/firefox/userContent.css
+++ b/modules/firefox/userContent.css
@@ -10,311 +10,3 @@
     display: none !important;
   }
 }
-
-@-moz-document regexp("https?://.*")
-{
-  iframe[src^="https://accounts.google.com/gsi/iframe"]
-  {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://(www)?yandex\.(com|ru)/search/.*")
-{
-  #search-result-aside,
-  .RelatedAbove {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://music\.yandex\.ru.*")
-{
-  .bar-below.bar-below_plus,
-  .footer,
-  .notify,
-  .teaser {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://(.*.)?gitlab(\..*)?\.(com|org).*")
-{
-  body {
-    font-family: var(--sans-serif-font-family) !important;
-    font-size: var(--sans-serif-font-size) !important;
-  }
-
-  code {
-    font-family: var(--monospace-font-family) !important;
-    font-size: var(--monospace-font-size) !important;
-  }
-}
-
-@-moz-document regexp("https?://(.*\.)?github.com.*")
-{
-  .color-fg-muted.f6.mt-4, /* GitHub profile guide. */
-  .flex-order-1.flex-md-order-none, /* Follow button. */
-  .js-user-status-item,
-  .protip,
-  .pt-3.mt-3.d-none.d-md-block, /* Profile achievements. */
-  .user-status-circle-badge-container,
-  .user-status-container,
-  a[href^="/account/choose?action=upgrade"],
-  a[href^="/collections"],
-  a[href^="/contact/report-content"],
-  a[href^="/events"],
-  a[href^="/explore"],
-  a[href^="/github-copilot"],
-  a[href^="/organizations/enterprise"],
-  a[href^="/settings/enterprises"],
-  a[href^="/sponsors"],
-  a[href^="/topics"],
-  a[href^="/trending"],
-  a[href^="https://github.com/codespaces"], /* Absolute cringe... */
-  button[data-testid="copilot-popover-button"],
-  details[id^="funding-links-modal"],
-  footer {
-    display: none !important;
-  }
-
-  .application-main {
-    padding-bottom: 20px !important;
-  }
-
-  .blob-num,
-  .blob-code-inner {
-    font-family: var(--monospace-font-family) !important;
-    font-size: var(--monospace-font-size) !important;
-  }
-}
-
-@-moz-document regexp("https?://github.com/?")
-{
-  .application-main {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://.*(stack(exchange|overflow)|askubuntu|superuser|serverfault)\.com/questions/.*")
-{
-  html,
-  body {
-    --ff-mono: var(--monospace-font-family) !important;
-    --ff-sans: var(--sans-serif-font-family) !important;
-    --ff-serif: var(--serif-font-family) !important;
-  }
-
-  #announcement-banner,
-  #footer,
-  #left-sidebar,
-  #noscript-warning,
-  #notify-container,
-  #post-form,
-  #sidebar,
-  .ai-start,
-  .bottom-notice,
-  .d-flex.g4,
-  .d-flex.s-btn-group,
-  .js-add-link.comments-link,
-  .js-consent-banner,
-  .js-dismissable-hero,
-  .js-post-issue,
-  .js-saves-btn,
-  .js-show-link.comments-link,
-  .js-vote-down-btn,
-  .js-vote-up-btn,
-  .post-taglist,
-  .s-notice,
-  .s-topbar,
-  .site-header,
-  a.ws-nowrap {
-    display: none !important;
-  }
-
-  #mainbar {
-    width: 100% !important;
-  }
-
-  #content {
-    margin-top: -50px !important;
-    border-width: 0 0 0 0 !important;
-  }
-}
-
-@-moz-document regexp("https?://kubernetes\.io/docs/.*")
-{
-  .announcement,
-  .announcement-main,
-  .d-none {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://min\.io/docs/.*")
-{
-  #cookie {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://werf\.io/documentation/.*")
-{
-  .guides-banner {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://grafana\.com/docs/.*")
-{
-  .ads__content,
-  .scroll,
-  .sticky-footer {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://habr\.com/(ru|en)/(articles|company/.*/news|news|companies|blog|post)/.*")
-{
-  .Vue-Toastification__container,
-  .tm-article-labels,
-  .tm-article-presenter__banner,
-  .tm-article-presenter__footer,
-  .tm-article-presenter__meta,
-  .tm-article-snippet__labels,
-  .tm-base-layout__header,
-  .tm-block.tm-block_spacing-bottom,
-  .tm-comment-footer,
-  .tm-comment__header,
-  .tm-editoral-subscription,
-  .tm-footer,
-  .tm-footer-menu,
-  .tm-header,
-  .tm-notice,
-  .tm-page__header,
-  .tm-page__sidebar,
-  .tm-placeholder-inset,
-  .tm-placeholder-promo,
-  .tm-user-info,
-  vue-portal-target {
-    display: none !important;
-  }
-
-  * {
-    transition: none !important;
-  }
-
-  html,
-  body {
-    font-family: var(--sans-serif-font-family) !important;
-    font-size: var(--sans-serif-font-size) !important;
-  }
-
-  #app {
-    height: auto !important;
-  }
-
-  .tm-article-presenter__footer,
-  .tm-page__main_has-sidebar {
-    margin-left: auto !important;
-    margin-right: auto !important;
-    max-width: 100% !important;
-  }
-
-  .tm-page {
-    padding: 0 !important;
-  }
-
-  .tm-comment__buttons {
-    margin: 0 !important;
-  }
-
-  html,
-  body {
-    font-family: var(--sans-serif-font-family) !important;
-    font-size: var(--sans-serif-font-size) !important;
-  }
-
-  code {
-    font-family: var(--monospace-font-family) !important;
-    font-size: var(--monospace-font-size) !important;
-  }
-}
-
-@-moz-document regexp("https?://jisho\.org.*")
-{
-  header,
-  footer {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?:\/\/gog\.com.*") {
-  .galaxy-section-wrapper,
-  footer {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://steamdb\.info.*")
-{
-  #steamdb-extension-protip {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://(.*\.)?hh\.ru.*")
-{
-  .HH-Supernova-Footer,
-  .index-dashboard-applicant__banners,
-  .notification-manager,
-  .resume-sidebar-background,
-  .supernova-overlay {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://developer\.mozilla\.org.*")
-{
-  #nav-footer,
-  .main-document-header-container.top-navigation,
-  .mdn-cta-container,
-  .top-banner.fallback {
-    display: none !important;
-  }
-
-  .sidebar {
-    --offset: default !important;
-  }
-
-  html,
-  body {
-    font-family: var(--sans-serif-font-family) !important;
-    font-size: var(--sans-serif-font-size) !important;
-  }
-}
-
-@-moz-document regexp("https?://duckduckgo\.com.*")
-{
-  .badge-link, /* Annoying DuckDuckGo extension ads. */
-  .footer {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://ecosia\.org.*")
-{
-  .cookie-wrapper,
-  .main-header__install-cta,
-  .meta-results,
-  .notifications,
-  .personal-counter {
-    display: none !important;
-  }
-}
-
-@-moz-document regexp("https?://app\.slack\.com\.*")
-{
-  .p-client__banners.p-ia__workspace_banner {
-    display: none !important;
-  }
-}