From 7367cae759ddbd644df03fddeb521b98ce1d7de3 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 2 Sep 2024 21:47:26 +0800 Subject: [PATCH] Revert "packages.firefox: add default-pwa profile" This reverts commit 6fc2c61ca1bd400e62b8ad240f9ce58523aba805. --- modules/packages/firefox.nix | 73 +++++++++++++++++------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/modules/packages/firefox.nix b/modules/packages/firefox.nix index 6bd20d9d..a3dd610f 100644 --- a/modules/packages/firefox.nix +++ b/modules/packages/firefox.nix @@ -25,48 +25,45 @@ inputs: { enable = true; nativeMessagingHosts = with inputs.pkgs; [ plasma-browser-integration uget-integrator firefoxpwa ]; + # TODO: use fixed-version of plugins policies.DefaultDownloadDirectory = "\${home}/Downloads"; - profiles = rec + profiles.default = { - default = - { - extensions = with inputs.pkgs.firefox-addons; - [ - immersive-translate tampermonkey bitwarden cookies-txt dualsub firefox-color i-dont-care-about-cookies - metamask pakkujs switchyomega rsshub-radar rsspreview tabliss tree-style-tab ublock-origin wallabagger - wappalyzer grammarly plasma-integration zotero-connector - (buildFirefoxXpiAddon - { - pname = "pwas-for-firefox"; - version = "2.12.1"; - addonId = "firefoxpwa@filips.si"; - url = "https://addons.mozilla.org/firefox/downloads/file/4293028/pwas_for_firefox-2.12.1.xpi"; - sha256 = "sha256-m8BCAlQt37RxVnWw+2hIPnmofTicNa5OWkwXp/IXdWY="; - meta = {}; - }) - ]; - search = { default = "Google"; force = true; }; - userChrome = builtins.readFile "${inputs.topInputs.lepton}/userChrome.css"; - userContent = builtins.readFile "${inputs.topInputs.lepton}/userContent.css"; - extraConfig = builtins.readFile "${inputs.topInputs.lepton}/user.js"; - settings = + extensions = with inputs.pkgs.firefox-addons; + [ + immersive-translate tampermonkey bitwarden cookies-txt dualsub firefox-color i-dont-care-about-cookies + metamask pakkujs switchyomega rsshub-radar rsspreview tabliss tree-style-tab ublock-origin wallabagger + wappalyzer grammarly plasma-integration zotero-connector + (buildFirefoxXpiAddon { - # general - "browser.search.region" = "CN"; - "intl.locale.requested" = "zh-CN,en-US"; - "browser.aboutConfig.showWarning" = false; - "browser.bookmarks.showMobileBookmarks" = true; - "browser.download.panel.shown" = true; - "browser.download.useDownloadDir" = true; - "browser.newtab.extensionControlled" = true; - "browser.toolbars.bookmarks.visibility" = "never"; - # allow to apply userChrome.css - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - # automatically enable extensions - "extensions.autoDisableScopes" = 0; - }; + pname = "pwas-for-firefox"; + version = "2.12.1"; + addonId = "firefoxpwa@filips.si"; + url = "https://addons.mozilla.org/firefox/downloads/file/4293028/pwas_for_firefox-2.12.1.xpi"; + sha256 = "sha256-m8BCAlQt37RxVnWw+2hIPnmofTicNa5OWkwXp/IXdWY="; + meta = {}; + }) + ]; + search = { default = "Google"; force = true; }; + userChrome = builtins.readFile "${inputs.topInputs.lepton}/userChrome.css"; + userContent = builtins.readFile "${inputs.topInputs.lepton}/userContent.css"; + extraConfig = builtins.readFile "${inputs.topInputs.lepton}/user.js"; + settings = + { + # general + "browser.search.region" = "CN"; + "intl.locale.requested" = "zh-CN,en-US"; + "browser.aboutConfig.showWarning" = false; + "browser.bookmarks.showMobileBookmarks" = true; + "browser.download.panel.shown" = true; + "browser.download.useDownloadDir" = true; + "browser.newtab.extensionControlled" = true; + "browser.toolbars.bookmarks.visibility" = "never"; + # allow to apply userChrome.css + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + # automatically enable extensions + "extensions.autoDisableScopes" = 0; }; - default-pwa = default // { id = 1; }; }; }; home.file.".mozilla/firefox/profiles.ini".force = true;